Fixed zoom issues