Clean up some zooming oddities; fixes issues 434 and 280