Some minor fix for emacs plugin