Better port matching