Fix more fallout