Sync improvements