small changes to work with emacs24.4