fix ups for cm12