Small emacs changes