CMA-29 more syntax fixes