Various fixes, incl eshell and notmuch