Fix some more fc's

Change-Id: If845fd72db5d0abe5a58e2f67be5b8bbf3548a9f