Fixing sync problems