Team fixes