Locking zoom + other fixes