diff --git a/posix-configs/SITL/init/rcS b/posix-configs/SITL/init/rcS
index c89714c02c..319cf4214d 100644
--- a/posix-configs/SITL/init/rcS
+++ b/posix-configs/SITL/init/rcS
@@ -7,8 +7,8 @@ dataman start
 mavlink start -u 14556 -r 60000
 simulator start -s
 param set CAL_GYRO0_ID 2293760
-param set CAL_ACC0_ID 1310720
-param set CAL_ACC1_ID 1376256
+param set CAL_ACC0_ID 1376256
+param set CAL_ACC1_ID 1310720
 param set CAL_MAG0_ID 196608
 param set CAL_GYRO0_XOFF 0.01
 param set CAL_ACC0_XOFF 0.01
diff --git a/src/drivers/device/vdev.cpp b/src/drivers/device/vdev.cpp
index 89a3da3e0a..d992851309 100644
--- a/src/drivers/device/vdev.cpp
+++ b/src/drivers/device/vdev.cpp
@@ -324,6 +324,7 @@ VDev::ioctl(file_t *filep, int cmd, unsigned long arg)
         case DEVIOCGDEVICEID:
                 ret = (int)_device_id.devid;
 		PX4_INFO("IOCTL DEVIOCGDEVICEID %d", ret);
+		break;
 	default:
 		break;
 	}
diff --git a/src/drivers/device/vdev_posix.cpp b/src/drivers/device/vdev_posix.cpp
index 727b92a1ed..975700d4e8 100644
--- a/src/drivers/device/vdev_posix.cpp
+++ b/src/drivers/device/vdev_posix.cpp
@@ -201,7 +201,7 @@ int px4_ioctl(int fd, int cmd, unsigned long arg)
 		px4_errno = -ret;
 	}
 	
-        return (ret == 0) ? PX4_OK : PX4_ERROR;
+        return ret;
 }
 
 int px4_poll(px4_pollfd_struct_t *fds, nfds_t nfds, int timeout)