Some tweaks for hunterk's buildbot.