Improved NIC detection