Fixed text wrap issues. Pulled in fixes from CCL.