Fix more build dependencies