Minor fixes to chat