fix stuff
fix for emacs 24.3