Fixes for running outside the DC repo

Fixes #270 and others