more in-emacs-d adjustments