Tweak for latest versions of OS X and Emacs