Fix comment problems