Fix bugs with zoom