fixes based on openstack-containers work