Adjust to Emacs24