diff --git a/src/drivers/ms5611/ms5611_i2c.cpp b/src/drivers/ms5611/ms5611_i2c.cpp
index 257e42a2de..730fd9b968 100644
--- a/src/drivers/ms5611/ms5611_i2c.cpp
+++ b/src/drivers/ms5611/ms5611_i2c.cpp
@@ -120,7 +120,7 @@ MS5611_I2C::MS5611_I2C(uint8_t bus, ms5611::prom_u &prom) :
 #ifdef __PX4_NUTTX
 nullptr, bus, 0, 400000
 #else
-"/vdev/MS5611_I2C", bus, 0
+"/dev/MS5611_I2C", bus, 0
 #endif
 ),
 	_prom(prom)
diff --git a/src/drivers/ms5611/ms5611_sim.cpp b/src/drivers/ms5611/ms5611_sim.cpp
index b99e35b676..ab7656b9c3 100644
--- a/src/drivers/ms5611/ms5611_sim.cpp
+++ b/src/drivers/ms5611/ms5611_sim.cpp
@@ -100,7 +100,7 @@ MS5611_sim_interface(ms5611::prom_u &prom_buf, uint8_t busnum)
 }
 
 MS5611_SIM::MS5611_SIM(uint8_t bus, ms5611::prom_u &prom) :
-	SIM("MS5611_SIM", "/vdev/MS5611_SIM", bus, 0),
+	SIM("MS5611_SIM", "/dev/MS5611_SIM", bus, 0),
 	_prom(prom)
 {
 }
diff --git a/src/platforms/linux/drivers/accelsim/accelsim.cpp b/src/platforms/linux/drivers/accelsim/accelsim.cpp
index f2d30a9e06..97314ab846 100644
--- a/src/platforms/linux/drivers/accelsim/accelsim.cpp
+++ b/src/platforms/linux/drivers/accelsim/accelsim.cpp
@@ -74,9 +74,9 @@
 #endif
 static const int ERROR = -1;
 
-#define ACCELSIM_DEVICE_PATH_ACCEL	"/vdev/sim_accel"
-#define ACCELSIM_DEVICE_PATH_ACCEL_EXT	"/vdev/sim_accel_ext"
-#define ACCELSIM_DEVICE_PATH_MAG	"/vdev/sim_mag"
+#define ACCELSIM_DEVICE_PATH_ACCEL	"/dev/sim_accel"
+#define ACCELSIM_DEVICE_PATH_ACCEL_EXT	"/dev/sim_accel_ext"
+#define ACCELSIM_DEVICE_PATH_MAG	"/dev/sim_mag"
 
 #define ADDR_WHO_AM_I			0x0F
 
diff --git a/src/platforms/linux/drivers/barosim/baro.cpp b/src/platforms/linux/drivers/barosim/baro.cpp
index 05040c0909..8398d18c58 100644
--- a/src/platforms/linux/drivers/barosim/baro.cpp
+++ b/src/platforms/linux/drivers/barosim/baro.cpp
@@ -788,7 +788,7 @@ struct barosim_bus_option {
 	uint8_t busnum;
 	BAROSIM *dev;
 } bus_options[] = {
-	{ BAROSIM_BUS_SIM_EXTERNAL, "/vdev/baro_sim", &BAROSIM_sim_interface, PX4_SIM_BUS_TEST, NULL },
+	{ BAROSIM_BUS_SIM_EXTERNAL, "/dev/baro_sim", &BAROSIM_sim_interface, PX4_SIM_BUS_TEST, NULL },
 };
 #define NUM_BUS_OPTIONS (sizeof(bus_options)/sizeof(bus_options[0]))
 
diff --git a/src/platforms/linux/drivers/barosim/baro_sim.cpp b/src/platforms/linux/drivers/barosim/baro_sim.cpp
index a9374137fe..2e628f571c 100644
--- a/src/platforms/linux/drivers/barosim/baro_sim.cpp
+++ b/src/platforms/linux/drivers/barosim/baro_sim.cpp
@@ -101,7 +101,7 @@ BAROSIM_sim_interface(barosim::prom_u &prom_buf, uint8_t busnum)
 }
 
 BARO_SIM::BARO_SIM(uint8_t bus, barosim::prom_u &prom) :
-	SIM("BARO_SIM", "/vdev/BARO_SIM", bus, 0),
+	SIM("BARO_SIM", "/dev/BARO_SIM", bus, 0),
 	_prom(prom)
 {
 }
diff --git a/src/platforms/linux/drivers/gyrosim/gyrosim.cpp b/src/platforms/linux/drivers/gyrosim/gyrosim.cpp
index d117cab9a1..c39ebeac0f 100644
--- a/src/platforms/linux/drivers/gyrosim/gyrosim.cpp
+++ b/src/platforms/linux/drivers/gyrosim/gyrosim.cpp
@@ -675,7 +675,8 @@ GYROSIM::transfer(uint8_t *send, uint8_t *recv, unsigned len)
 	}
 	else {
 		printf("Writing %u bytes to register %u\n", len-1, reg);
-		memcpy(&recv[1], &_regdata[reg-MPUREG_PRODUCT_ID], len-1);
+		if (recv)
+			memcpy(&recv[1], &_regdata[reg-MPUREG_PRODUCT_ID], len-1);
 	}
 	return PX4_OK;
 }