Fix bugs for Team Control extension