diff --git a/src/drivers/device/vdev.cpp b/src/drivers/device/vdev.cpp
index 63ee720bdf..470b8388b3 100644
--- a/src/drivers/device/vdev.cpp
+++ b/src/drivers/device/vdev.cpp
@@ -550,18 +550,16 @@ void VDev::showDevices()
 	pthread_mutex_unlock(&devmutex);
 
 	PX4_INFO("DF Devices:");
-	// TODO NOT IMPLEMENTED
-
-	std::string devname;
+	std::string dev_path, instance_path;
 	unsigned int index = 0;
 	i = 0;
 
 	do {
 		// Each look increments index and returns -1 if end reached
-		i = DevMgr::getNextDeviceName(index, devname);
+		i = DevMgr::getNextDevicePath(index, dev_path, instance_path);
 
 		if (i == 0) {
-			PX4_INFO("   %s", devname.c_str());
+			PX4_INFO("   %s (%s)", dev_path.c_str(), instance_path.c_str());
 		}
 	} while (i == 0);
 }
diff --git a/src/lib/DriverFramework b/src/lib/DriverFramework
index a09333b9e4..45878058a7 160000
--- a/src/lib/DriverFramework
+++ b/src/lib/DriverFramework
@@ -1 +1 @@
-Subproject commit a09333b9e418b84b51788ec9f349e4d4b9253448
+Subproject commit 45878058a7b37a9bba370396526b95cd7c2a3ab9
diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp
index f794972e8a..a135e9dfca 100644
--- a/src/modules/commander/state_machine_helper.cpp
+++ b/src/modules/commander/state_machine_helper.cpp
@@ -496,25 +496,25 @@ transition_result_t hil_state_transition(hil_state_t new_state, orb_advert_t sta
 
 
 				// Handle DF devices
-				std::string dfdevname;
+				std::string df_dev_path, df_dev_instance_path;
 				unsigned int index = 0;
 				for(;;) {
-					if (DevMgr::getNextDeviceName(index, dfdevname) < 0) {
+					if (DevMgr::getNextDevicePath(index, df_dev_path, df_dev_instance_path) < 0) {
 						break;
 					}
 
 					DevHandle h;
-					DevMgr::getHandle(dfdevname.c_str(), h);
+					DevMgr::getHandle(df_dev_path.c_str(), h);
 
 					if (!h.isValid()) {
-						warn("failed opening device %s", dfdevname.c_str());
+						warn("failed opening device %s", df_dev_path.c_str());
 						continue;
 					}
 
 					int block_ret = h.ioctl(DEVIOCSPUBBLOCK, 1);
 					DevMgr::releaseHandle(h);
 
-					printf("Disabling %s: %s\n", dfdevname.c_str(), (block_ret == OK) ? "OK" : "ERROR");
+					printf("Disabling %s: %s\n", df_dev_path.c_str(), (block_ret == OK) ? "OK" : "ERROR");
 				}
 
 				ret = TRANSITION_CHANGED;
diff --git a/src/platforms/posix/drivers/accelsim/accelsim.cpp b/src/platforms/posix/drivers/accelsim/accelsim.cpp
index f95e508b21..5928ca834b 100644
--- a/src/platforms/posix/drivers/accelsim/accelsim.cpp
+++ b/src/platforms/posix/drivers/accelsim/accelsim.cpp
@@ -1182,6 +1182,10 @@ accelsim_main(int argc, char *argv[])
 		}
 	}
 
+	if (argc <= 1) {
+		accelsim::usage();
+		return 1;
+	}
 	const char *verb = argv[myoptind];
 
 	/*