Fixes to devstack complex1