Some elisp fixes