Some minor tweaks for updating prod
Merge pull request #351 from fkalseth/fixes-for-release

Some minor tweaks for updating prod