Fixes for running outside the DC repo