A few tweaks to elisp stuff