Bug #2570: Fixed up some minor cosmetic bugs