Fixes for emacs 24.4