Improve settings for Emacs 24.4