fixes #523
Merge pull request #537 from mozilla/chris-fixes

[WIP] fixes