Quota / Usage fix