Small fixes
Switch to Openstack provisioning