Minor changes in camera handling