More tweaks to get buildbot running smoothly