Openstack fixes