CDEC-22: small fixes