Fix some problem occurred when using Emacs 24.3.