Some minor changes on the sync protocol