Lump of changes, primarily to weechat