Some fixes for sync
Cleanup
Merge to Branch