Fix comment issues