Unbreak CP with changes done lately