Fixing zoom bugs