Fixingng up sync issues