buildbot fixes