Synced some stuff from TeamRepo.