Improving NIC detection