Fixes for Emacs 25