Attempt to fix flying bug reported by VanessaE and PilzAdam. Also fix a minor problem with getting out of water