Fixes and simplifies messaging to teams, for issue 1408