Fixes for OpenStack provider