fixes for chat stuff