fixes for data sync