misc bug fixes
Merge pull request #598 from code-dot-org/webapp_bug_fixes

misc bug fixes