Fixed some issues caused by sync conflicts