TMR compat and Minor model changes