Yet more fixes to chat