Fixed water errors