Fix the buildbots