Updates for emacs 24.4