Simplify synchronize fixes #2