Sync issues

More sync issues fixed.