More comment fixes