Fixed a number of bugs related to starting reconciilation from scratch