Fixing buildbot problems