DC: some fixups

Change-Id: I0e6a42343b6c55e9218f5d70e17f216477acd4dd