Fixed some bugs with the chat