Fixing bug and changes to Openstack