Small updates to chat keys