This fixes issues with new ports not (always) appearing in port matrices (and presumably elsewhere too)