Quota fixes and cleanup