Minor changes to water sahders