More fixes to the camera