Rework some devstack things