Some required changes to the way the chat handling works.