Fix more FCs