Added some helpers for easier sync.
Fixes to sync.