Cleanup fixes, cleanup on pan/zoom