Hopefully fix a bunch of locked team bugs