fixes for nova, porting fixes from the openstack driver