Last minute DRC fixes