Fixes for sync