Fix a couple issues
Merge branch 'master' into prod