Tweaks to what's committed in .weechat