Second round of text fixes