Fixing a few smallish issues
Merge pull request #370 from mozilla/assorted-fixes

Fixing a few smallish issues