GPII-925: Minor formatting fixes