Fix some buildbot stuff