Fix syncing issues