A few more text message cleanups