watershed fixes