Production fixes
Merge pull request #1 from bvanbeynum/BrettDev

Production fixes