diff --git a/plugins/hifiNeuron/src/NeuronPlugin.cpp b/plugins/hifiNeuron/src/NeuronPlugin.cpp
index 41c0eb0d4e..0a4bc7f8d2 100644
--- a/plugins/hifiNeuron/src/NeuronPlugin.cpp
+++ b/plugins/hifiNeuron/src/NeuronPlugin.cpp
@@ -458,7 +458,7 @@ void NeuronPlugin::InputDevice::update(float deltaTime, const controller::InputC
         const glm::vec3& pos = joints[i].pos;
         const glm::vec3& rotEuler = joints[i].euler;
 
-        if ((Vectors::ZERO == pos && Vectors::ZERO == rotEuler)) {
+        if (Vectors::ZERO == pos && Vectors::ZERO == rotEuler) {
             _poseStateMap[poseIndex] = controller::Pose();
             continue;
         }
diff --git a/plugins/hifiSpacemouse/src/SpacemouseManager.cpp b/plugins/hifiSpacemouse/src/SpacemouseManager.cpp
index 8b584df366..3d9b93ff44 100644
--- a/plugins/hifiSpacemouse/src/SpacemouseManager.cpp
+++ b/plugins/hifiSpacemouse/src/SpacemouseManager.cpp
@@ -11,6 +11,10 @@
 
 #include "SpacemouseManager.h"
 
+#ifdef Q_OS_WIN
+#include <VersionHelpers.h>
+#endif
+
 #include <UserActivityLogger.h>
 #include <PathUtils.h>
 
@@ -171,8 +175,6 @@ void SpacemouseDevice::update(float deltaTime, const controller::InputCalibratio
 
 #ifdef Q_OS_WIN
 
-#include <VersionHelpers.h>
-
 bool SpacemouseManager::nativeEventFilter(const QByteArray& eventType, void* message, long* result) {
     MSG* msg = static_cast< MSG * >(message);
     return RawInputEventFilter(message, result);
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 5ca8f03ad7..12567b10d1 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -213,7 +213,6 @@ void ViveControllerManager::renderHand(const controller::Pose& pose, gpu::Batch&
 
 
 void ViveControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
-    _inputDevice->update(deltaTime, inputCalibrationData);
     auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
 
     // because update mutates the internal state we need to lock