fixes for chat