Fixes for team controller I think