CDEC-22: minor fixes