Better DCC handling