Fix more dependencies