Fix out-of-sync issues