Even more emacs changes