more buildbot2 fixes