Fixes for running outside the DC repo
Merge pull request #356 from tzz/master

Fixes for running outside the DC repo