fix things broken on the last nightly