Fixes to water