Small fixes to the camera logic