Teams Import fixes.