Fixed some sync issues