Fixes for emacs config