Fix up sync