fix issues with emacs 24.4