Fixes for buildbot.