Buildbot fixes