Fixed DCC issues at CD level