Fixing an issue with the build script failing to remove the object files for changed configure settings
Various build fixes