I found changing the tile size on the water zone to work ok, it was on 2400 and changing it to 1200 worked well.