Changes to camera and key handling in advance of mouse support