More emacs changes