Address water issues at earliest