Numerous team-bashing bug fixes