Fix a couple my team bugs