fixes for Chat