fixes for volume support