Fixing a few sync issues.