Water improvements/fixes