Some minor cosmetic fixes