Fixing up the text parsing calls