Reconciliation fixes

@drexin @guenter