Fix comment types