Check CMA05-2, small fixes in CMA05-1