Minor changes to chat module