diff --git a/configurations/NVME P4000.json b/configurations/NVME P4000.json
index 3fe0ae3..da521cf 100644
--- a/configurations/NVME P4000.json
+++ b/configurations/NVME P4000.json
@@ -41,7 +41,7 @@
   ],
   "Name": "NVMe $index",
   "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'P\\d{4}\\w?'})",
-  "Type": "Board",
+  "Type": "Drive",
   "xyz.openbmc_project.Inventory.Decorator.Asset": {
     "Manufacturer": "$PRODUCT_MANUFACTURER",
     "Model": "$PRODUCT_PRODUCT_NAME",
diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 25cc86c..a7a9533 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -1254,7 +1254,7 @@
                     _passed = true;
 
                     PASSED_PROBES.push_back(probeName);
-                    size_t foundDeviceIdx = 0;
+                    size_t foundDeviceIdx = 1;
 
                     for (auto& foundDevice : foundDevices)
                     {