Fix devstack and CI breakage.