reconcile fixes