Fixed up some sync issues