CMA-29 fixes