Re: Couple of textw fixes for master and RHEL6