Had to change some internal code because kill-buffer was complaining...