Fix comment placements