More zoom fixes