More fixes for zoom