First round of team feedback bug fixes