Minor functionality patches to camera