Production fixes
Merge pull request #15 from wtg/productionFixes

Production fixes