A few comment fixes