diff --git a/src/psmoveconfigtool/AppSubStage_CalibrateWithMat.cpp b/src/psmoveconfigtool/AppSubStage_CalibrateWithMat.cpp
index 54b05ac3..ace61c16 100644
--- a/src/psmoveconfigtool/AppSubStage_CalibrateWithMat.cpp
+++ b/src/psmoveconfigtool/AppSubStage_CalibrateWithMat.cpp
@@ -198,7 +198,7 @@ AppSubStage_CalibrateWithMat::AppSubStage_CalibrateWithMat(
 	, m_sampleLocationIndex(0)
     , m_bNeedMoreSamplesAtLocation(false)
 {
-	for (int location_index = 0; location_index < k_mat_sample_location_count; ++location_index)
+	for (int location_index = 0; location_index < PSMOVESERVICE_MAX_TRACKER_COUNT; ++location_index)
 	{
 		m_deviceTrackerPoseStats[location_index] = new TrackerRelativePoseStatistics;
 	}
@@ -206,7 +206,7 @@ AppSubStage_CalibrateWithMat::AppSubStage_CalibrateWithMat(
 
 AppSubStage_CalibrateWithMat::~AppSubStage_CalibrateWithMat()
 {
-	for (int location_index = 0; location_index < k_mat_sample_location_count; ++location_index)
+	for (int location_index = 0; location_index < PSMOVESERVICE_MAX_TRACKER_COUNT; ++location_index)
 	{
 		delete m_deviceTrackerPoseStats[location_index];
 	}
diff --git a/src/psmoveprotocol/ProtocolVersion.h b/src/psmoveprotocol/ProtocolVersion.h
index a172b474..71d5cbf6 100644
--- a/src/psmoveprotocol/ProtocolVersion.h
+++ b/src/psmoveprotocol/ProtocolVersion.h
@@ -14,7 +14,7 @@
 #define PSM_RELEASE_VERSION_PHASE   alpha
 #define PSM_RELEASE_VERSION_MINOR   8
 #define PSM_RELEASE_VERSION_RELEASE 7
-#define PSM_RELEASE_VERSION_HOTFIX  1
+#define PSM_RELEASE_VERSION_HOTFIX  2
 
 /// "Product.Major-Phase Minor.Release.Hotfix"
 #if !defined(PSM_RELEASE_VERSION_STRING)