Fixed a number of water bugs.