Fix Emacs-24.4.1 issues.