More minor cosmetic fixes