More comma fixing