Fix comma issues