diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index c6f84b9a59..1906cb7979 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -112,12 +112,11 @@ bool OctreeSendThread::process() {
     return isStillRunning();  // keep running till they terminate us
 }
 
-AtomicUIntStat OctreeSendThread::_usleepTime = 0;
-AtomicUIntStat OctreeSendThread::_usleepCalls = 0;
-
-AtomicUIntStat OctreeSendThread::_totalBytes = 0;
-AtomicUIntStat OctreeSendThread::_totalWastedBytes = 0;
-AtomicUIntStat OctreeSendThread::_totalPackets = 0;
+AtomicUIntStat OctreeSendThread::_usleepTime { 0 };
+AtomicUIntStat OctreeSendThread::_usleepCalls { 0 };
+AtomicUIntStat OctreeSendThread::_totalBytes { 0 };
+AtomicUIntStat OctreeSendThread::_totalWastedBytes { 0 };
+AtomicUIntStat OctreeSendThread::_totalPackets { 0 };
 
 int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytesSent, int& truePacketsSent) {
     OctreeServer::didHandlePacketSend(this);
diff --git a/libraries/octree/src/OctreeElement.cpp b/libraries/octree/src/OctreeElement.cpp
index 6bb39871bb..48172bd9fe 100644
--- a/libraries/octree/src/OctreeElement.cpp
+++ b/libraries/octree/src/OctreeElement.cpp
@@ -245,12 +245,11 @@ bool OctreeElement::isParentOf(OctreeElementPointer possibleChild) const {
     return false;
 }
 
-AtomicUIntStat OctreeElement::_getChildAtIndexTime = 0;
-AtomicUIntStat OctreeElement::_getChildAtIndexCalls = 0;
-AtomicUIntStat OctreeElement::_setChildAtIndexTime = 0;
-AtomicUIntStat OctreeElement::_setChildAtIndexCalls = 0;
-
-AtomicUIntStat OctreeElement::_externalChildrenCount = 0;
+AtomicUIntStat OctreeElement::_getChildAtIndexTime { 0 };
+AtomicUIntStat OctreeElement::_getChildAtIndexCalls { 0 };
+AtomicUIntStat OctreeElement::_setChildAtIndexTime { 0 };
+AtomicUIntStat OctreeElement::_setChildAtIndexCalls { 0 };
+AtomicUIntStat OctreeElement::_externalChildrenCount { 0 };
 AtomicUIntStat OctreeElement::_childrenCount[NUMBER_OF_CHILDREN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 OctreeElementPointer OctreeElement::getChildAtIndex(int childIndex) const {
diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp
index 5ed891fc7c..7a255ad648 100644
--- a/libraries/octree/src/OctreePacketData.cpp
+++ b/libraries/octree/src/OctreePacketData.cpp
@@ -16,12 +16,12 @@
 #include "OctreePacketData.h"
 
 bool OctreePacketData::_debug = false;
-AtomicUIntStat OctreePacketData::_totalBytesOfOctalCodes = 0;
-AtomicUIntStat OctreePacketData::_totalBytesOfBitMasks = 0;
-AtomicUIntStat OctreePacketData::_totalBytesOfColor = 0;
-AtomicUIntStat OctreePacketData::_totalBytesOfValues = 0;
-AtomicUIntStat OctreePacketData::_totalBytesOfPositions = 0;
-AtomicUIntStat OctreePacketData::_totalBytesOfRawData = 0;
+AtomicUIntStat OctreePacketData::_totalBytesOfOctalCodes { 0 };
+AtomicUIntStat OctreePacketData::_totalBytesOfBitMasks { 0 };
+AtomicUIntStat OctreePacketData::_totalBytesOfColor { 0 };
+AtomicUIntStat OctreePacketData::_totalBytesOfValues { 0 };
+AtomicUIntStat OctreePacketData::_totalBytesOfPositions { 0 };
+AtomicUIntStat OctreePacketData::_totalBytesOfRawData { 0 };
 
 OctreePacketData::OctreePacketData(bool enableCompression, int targetSize) {
     changeSettings(enableCompression, targetSize); // does reset...