More fixes to the build files after trying to build the whole thing again for release