Fix build and fc