Refactored water to fix compile error
Minor fixes