Improves handling of text messages, broadcasts