Some emacs fixes