pre-launch fixes
Merge branch 'master' of https://github.com/gopilot/DC