Various changes in emacs