Bugfixes to swbuff-x emacs package