Fix up teams