Fixing some strange issues with the comments.