More zooming fixes