Few more tweaks to openstack framework.