Some small fixes to chat