More fixes to first-person view