Fix more bugs in 1D SW with bathymetry.