diff --git a/Runtime/Input/CRumbleGenerator.cpp b/Runtime/Input/CRumbleGenerator.cpp
index 7887c405d..ce2ee350a 100644
--- a/Runtime/Input/CRumbleGenerator.cpp
+++ b/Runtime/Input/CRumbleGenerator.cpp
@@ -24,8 +24,9 @@ void CRumbleGenerator::Update(float dt) {
   if (!b_tp) {
     b_tp = true;
     s_tp = now;
-  } else
+  } else {
     ms = std::chrono::duration_cast<std::chrono::milliseconds>(now - s_tp).count();
+  }
 #endif
 
   if (!xf0_24_disabled) {
@@ -38,7 +39,7 @@ void CRumbleGenerator::Update(float dt) {
         if (xe0_commandArray[i] != EMotorState::Stop) {
 #if PWM_MONITOR
           s_tp = now;
-          printf("%lldms ON\n", ms);
+          fmt::print(FMT_STRING("{}ms ON\n"), ms);
 #endif
           xe0_commandArray[i] = EMotorState::Stop;
           updated = true;
@@ -50,7 +51,7 @@ void CRumbleGenerator::Update(float dt) {
           if (xe0_commandArray[i] != EMotorState::Rumble) {
 #if PWM_MONITOR
             s_tp = now;
-            printf("%lldms Off\n", ms);
+            fmt::print(FMT_STRING("{}ms Off\n"), ms);
 #endif
             xe0_commandArray[i] = EMotorState::Rumble;
             updated = true;
@@ -62,7 +63,7 @@ void CRumbleGenerator::Update(float dt) {
             if (xe0_commandArray[i] != EMotorState::Stop) {
 #if PWM_MONITOR
               s_tp = now;
-              printf("%lldms ON\n", ms);
+              fmt::print(FMT_STRING("{}ms ON\n"), ms);
 #endif
               xe0_commandArray[i] = EMotorState::Stop;
               updated = true;
diff --git a/Runtime/Particle/CDecalManager.cpp b/Runtime/Particle/CDecalManager.cpp
index 831d5c6f7..19b94ec98 100644
--- a/Runtime/Particle/CDecalManager.cpp
+++ b/Runtime/Particle/CDecalManager.cpp
@@ -21,8 +21,9 @@ void CDecalManager::Initialize() {
     return;
 
   m_DecalPool.clear();
-  for (int i = 0; i < 64; ++i)
-    m_DecalPool.emplace_back(std::optional<CDecal>{}, 0, i - 1, false);
+  for (int i = 0; i < 64; ++i) {
+    m_DecalPool.emplace_back(std::nullopt, 0, i - 1, false);
+  }
 
   m_FreeIndex = 63;
   m_PoolInitialized = true;
@@ -39,8 +40,9 @@ void CDecalManager::Reinitialize() {
     Initialize();
 
   m_DecalPool.clear();
-  for (int i = 0; i < 64; ++i)
-    m_DecalPool.emplace_back(std::optional<CDecal>{}, 0, i - 1, false);
+  for (int i = 0; i < 64; ++i) {
+    m_DecalPool.emplace_back(std::nullopt, 0, i - 1, false);
+  }
 
   m_ActiveIndexList.clear();