CMA-29 more fixes