Emacs: small fixes