Lisp fixes

This should have ONLY the reconcile mode fixes.