Fix for 500s

2 quota fixes needed for Production release.

I'm probably going to have to do some flake8 fixes as well. They were *way* more locally than I was expecting (many not in my code change), so I'm wondering what Travis is going to say.
I thought the same thing when I added it, and I mostly did it this way assuming my predecessors knew something I didn't. I can certainly move it out.