Minor emacs fixes