Zoom, bug fixes