Fixing some more derpy sync issues.