Buildbot warning fixes