Team assert fixes