Try to fix sync issues