diff --git a/src/sensors/SensorManager.h b/src/sensors/SensorManager.h
index c2ebdb5c..e5871133 100644
--- a/src/sensors/SensorManager.h
+++ b/src/sensors/SensorManager.h
@@ -53,7 +53,7 @@ class SensorManager {
 
 	void update();
 
-	std::vector<std::unique_ptr<Sensor>>& getSensors() { return m_Sensors; };
+	std::vector<std::unique_ptr<::Sensor>>& getSensors() { return m_Sensors; };
 	ImuID getSensorType(size_t id) {
 		if (id < m_Sensors.size()) {
 			return m_Sensors[id]->getSensorType();
@@ -64,10 +64,10 @@ class SensorManager {
 private:
 	SlimeVR::Logging::Logger m_Logger;
 
-	std::vector<std::unique_ptr<Sensor>> m_Sensors;
+	std::vector<std::unique_ptr<::Sensor>> m_Sensors;
 
 	template <typename ImuType>
-	std::unique_ptr<Sensor> buildSensor(
+	std::unique_ptr<::Sensor> buildSensor(
 		uint8_t sensorID,
 		std::optional<uint8_t> imuAddress,
 		float rotation,
diff --git a/src/sensors/softfusion/CalibrationBase.h b/src/sensors/softfusion/CalibrationBase.h
index bb784cdc..3e8110e7 100644
--- a/src/sensors/softfusion/CalibrationBase.h
+++ b/src/sensors/softfusion/CalibrationBase.h
@@ -112,8 +112,8 @@ class CalibrationBase {
 
 	Sensors::SensorFusionRestDetect& fusion;
 	IMU& sensor;
-	SlimeVR::Logging::Logger& logger;
 	uint8_t sensorId;
+	SlimeVR::Logging::Logger& logger;
 	float TempTs;
 	double AScale;
 	double GScale;
diff --git a/src/sensors/softfusion/nonblockingcalibration/NonBlockingCalibration.h b/src/sensors/softfusion/nonblockingcalibration/NonBlockingCalibration.h
index 82c43316..40168511 100644
--- a/src/sensors/softfusion/nonblockingcalibration/NonBlockingCalibration.h
+++ b/src/sensors/softfusion/nonblockingcalibration/NonBlockingCalibration.h
@@ -379,7 +379,7 @@ class NonBlockingCalibrator
 		sensor
 	};
 	GyroBiasCalibrationStep<RawSensorT> gyroBiasCalibrationStep{calibration};
-	AccelBiasCalibrationStep<RawSensorT> accelBiasCalibrationStep{calibration, AScale};
+	AccelBiasCalibrationStep<RawSensorT> accelBiasCalibrationStep{calibration, static_cast<float>(Base::AScale)};
 	NullCalibrationStep<RawSensorT> nullCalibrationStep{calibration};
 
 	CalibrationStep<RawSensorT>* currentStep = &nullCalibrationStep;