Added a few performance modifications for the camera
Merge branch 'hotfix-camera'