Fix some of the Text/string errors?