More improvements to chat