Minor watershader improvements