Fix bugs introduce with Enterprise/Cloud refactor
Merge branch 'master' into refactor-fixes
Merge pull request #24 from mozilla/refactor-fixes

Refactor fixes