More fixes to zoom