Fix issues with CME