Finished fixing up sync.c differences