Settings: Fixed FC errors

Change-Id: I51f533492b3f87cc80cec2a1cccfe903f95e9b9a