Fix more breakages