Fix build & FC