Fixes in emacs module