More fixes to chat