diff --git a/srtcore/core.cpp b/srtcore/core.cpp
index 85bd2f369..73e370ed7 100644
--- a/srtcore/core.cpp
+++ b/srtcore/core.cpp
@@ -8776,10 +8776,7 @@ void CUDT::processCtrl(const CPacket &ctrlpkt)
     case UMSG_ACKACK: // 110 - Acknowledgement of Acknowledgement
     {
         int32_t ack = 0;
-        int     rtt = -1;
-
-        // update RTT
-        rtt = m_ACKWindow.acknowledge(ctrlpkt.getAckSeqNo(), ack);
+        const int rtt = m_ACKWindow.acknowledge(ctrlpkt.getAckSeqNo(), ack);
         if (rtt <= 0)
         {
             LOGC(inlog.Error,
diff --git a/srtcore/group.cpp b/srtcore/group.cpp
index 802a4ad01..1a28b03a0 100644
--- a/srtcore/group.cpp
+++ b/srtcore/group.cpp
@@ -3027,7 +3027,7 @@ class StabilityTracer
             return;
 
         std::string str_tnow = srt::sync::FormatTimeSys(srt::sync::steady_clock::now());
-        str_tnow.resize(str_tnow.size() - 6); // remove trailing ' [SYS]' part
+        str_tnow.resize(str_tnow.size() - 7); // remove trailing ' [SYST]' part
         while (str_tnow.find(':') != std::string::npos) {
             str_tnow.replace(str_tnow.find(':'), 1, 1, '_');
         }
@@ -3051,7 +3051,7 @@ StabilityTracer s_stab_trace;
 /// @retval  1 - link is identified as stable
 /// @retval  0 - link state remains unchanged (too early to identify, still in activation phase)
 /// @retval -1 - link is identified as unstable
-static int sendBackup_CheckRunningLinkStable(const CUDT& u, const srt::sync::steady_clock::time_point& currtime, uint16_t weight)
+static int sendBackup_CheckRunningLinkStable(const CUDT& u, const srt::sync::steady_clock::time_point& currtime, uint16_t weight ATR_UNUSED)
 {
     const uint32_t latency_us = u.peerLatency_us();
     const int32_t min_stability_us     = 60000; // Minimum Link Stability Timeout: 60ms.
diff --git a/srtcore/window.cpp b/srtcore/window.cpp
index 6e03b5d0b..0c40af128 100644
--- a/srtcore/window.cpp
+++ b/srtcore/window.cpp
@@ -85,7 +85,7 @@ int acknowledge(Seq* r_aSeq, const size_t size, int& r_iHead, int& r_iTail, int3
 
       for (int i = r_iTail, n = r_iHead; i < n; ++ i)
       {
-         // looking for indentical ACK Seq. No.
+         // looking for identical ACK Seq. No.
          if (seq == r_aSeq[i].iACKSeqNo)
          {
             // return the Data ACK it carried