Many fixes to water