Various fixes for volumes and quotas