Adjustements for emacs 24.3