some more tweaks for friendly emacs transition