Fixing the build replacements