More adjustments for Emacs-24.4