fixing some sync issues