Small changes to chat