Misc FoC fixes