Fix some bugs in the new CleanText impl, seems like the unit tests have failed to execute, sorry...