More fixes for comments.