Fix a few bugs with auto team get