Yes, that would be the ones for the switch and gauge cluster etc. but check the grounds in the trunk as well. IT sounds like the brake lights are trying to find another path to ground, so check grounding location back in the trunk drivers side as well.