More fixup for kw text