some fixes for Emacs