Fixes to syncing