cd-3 minor fixes