Started to adopt to emacs 24.4