DC: fix some bugs, cleanups

Change-Id: I55617347f70d1d25041ef9cc04f87c5486fb5640