more buildbot fixes