More work on Team / Global chat