Fixes to ObjectSync