Updates to support new build server set up