Teambuilder improvements/fixes