More emacs fixes