Changes to Emacs mostly