Teampage fixes