Fix more fixes