Team one fixes