Chat small fixes