Major changes for emacs24