Fixed issues with syncing