Some emacs changes