More quota work

Change-Id: I6706f62bb2748021fd2e92a44d203d044c54a58e