DCC: Some changes and fixes