Fixes for Emacs Lisp version

Warning: my Emacs Lisp is rudimentary, so please double check these.