More changes to use latest buildbot