More zoom optimizations