Some changes for emacs