Sync Fixes

Good stuff.