Fix more breakage
More fixes