Fixes in emacs helpers.