Fix MOE sync issues.