fixes to CD