(FBACores) Fixup solutions