fixes for emacs23