Updates and fixes for sync