Fix DD inconsistencies