Extra changes for dev0 and staging0
Merge pull request #38 from Coenego/upgrade-fixes

Extra changes for dev0 and staging0