More minor changes to emacs.