cm compat changes