Fix issues with cinder_volume