Added extra fixes to cdr