More DCO fixes