Fixed the project quita issues
Merge pull request #200 from sbavanasi/quota-bugs-master

Fixed the project quita issues