Bug fixes relating to zoom