Some final minor cosmetics