Adjusts for emacs 24.4