Team code corrections