CDL redesign: small fixes