Fix up MMTEL CDIV issues