Fix Quota, additional storage validations

[merge]