Further comment fixes