Yet some more text fixups