Misc changes for emacs 24.4