Fixes in teams