Fixed some water issues