Fix more FCs

Change-Id: I4a20f7ac25cb4e19c3f9004e5e6feef1686b016e