Some fixes for camera update