Reconciliation fixes (MID-1925, MID-1919)