Sundry emacs changes