Fixing remaining F::build and F::build in new code