Dealing with Sync Issues