Fixes for weird behavior of tree/anvil in water