Cm12.0 fix ups