Some fixes relating to manual zoom and resetting.