Dmitry fixes for reconciliation UI (in progress)