Comment block fixes