Misc updates for text support