Misc changes made in Emacs trunk