More sync improvements.
Improved syncing.