Replace some missed team checks with the proper macros