Apply two water patches by NoQ. Fixes loads of water bugs.
...Trash files...