Some fixes for Openstack :)