Emacs: Minor improvements