Make the build process more robust.