Rough attempt to fix these, since I don't have bolt building locally. Will see how the buildbots go with it...