Fixes to make camera behavior the same as before.