solve all those FCs

Change-Id: I2b2a0946ee7b9f70b7916f2d8f47c2f173f6673a