diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 838590a331..0033dc0290 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -37,7 +37,7 @@ permissions: {}
 #
 # - 10.7   Lion (2011)          - GSS (build-time, deprecated MIT Kerberos shim)
 # - 10.9   Mavericks (2013)     - LDAP (build-time, deprecated), memset_s(), OCSP (runtime)
-# - 10.10  Yosemite (2014)      - SYS_recvmsg_x, SYS_sendmsg_x (runtime)
+# - 10.10  Yosemite (2014)      - SYS_recvmsg_x, SYS_sendmsg_x (build-time)
 # - 10.11  El Capitan (2015)    - connectx() (runtime)
 # - 10.12  Sierra (2016)        - clock_gettime() (build-time, runtime)
 # - 10.14  Mojave (2018)        - SecTrustEvaluateWithError() (runtime), GSS Framework
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c3ed0c42da..b07d005978 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1064,8 +1064,9 @@ jobs:
               # Officially this requires the vcvarsall.bat MS-DOS batch file (as of
               # VS2022). Since it integrates badly with CI steps and shell scripts,
               # reproduce the necessary build configuration manually, without envs.
-              # The option is likely called: IgnoreStandardErrorWarningFormat=true,
-              # but there seems to be no option to pass it via CMake or CLI.
+              # The option to disable the MSBuild heuristics is likely called:
+              # IgnoreStandardErrorWarningFormat=true, but there seems to be no
+              # facility to pass it via CMake or CLI.
               MSVC_EDITION='2022/Enterprise/vc/tools/msvc'
               [[ "${MATRIX_IMAGE}" = *'windows-2025'* ]] && MSVC_EDITION='18/Enterprise/vc/tools/msvc'
               [[ "$(uname -s)" = *'ARM64'* ]] && MSVC_HOST='arm64' || MSVC_HOST='x64'  # x86
diff --git a/lib/url.c b/lib/url.c
index 8272a85e4e..5998cd69bc 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -199,7 +199,6 @@ static void up_free(struct Curl_easy *data)
  *
  * We ignore SIGPIPE when this is called from curl_easy_cleanup.
  */
-
 CURLcode Curl_close(struct Curl_easy **datap)
 {
   struct Curl_easy *data;
@@ -457,7 +456,6 @@ static void easy_meta_freeentry(void *p)
  * function.
  * @return CURLcode
  */
-
 CURLcode Curl_open(struct Curl_easy **curl)
 {
   struct Curl_easy *data;
diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index da9d7b023b..3f6c93f0bf 100644
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -163,7 +163,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
     }
 
     /* Use the special name "!ntlm" to prevent NTLM from being used:
-     * https://learn.microsoft.com/en-us/windows/win32/api/sspi/ns-sspi-sec_winnt_auth_identity_exa
+     * https://learn.microsoft.com/windows/win32/api/sspi/ns-sspi-sec_winnt_auth_identity_exa
      */
 #ifdef UNICODE
     nego->identity.PackageList =
diff --git a/tests/server/dnsd.c b/tests/server/dnsd.c
index 03bfef87da..62cbb8d9cf 100644
--- a/tests/server/dnsd.c
+++ b/tests/server/dnsd.c
@@ -788,11 +788,11 @@ static void queue_udp_clear(void)
 }
 
 /* this is an answer to a question */
-static struct udp_resp *
-udp_resp_create(int query_id,
-                const struct sockaddr *addr, curl_socklen_t addrlen,
-                const unsigned char *qbuf, size_t qlen,
-                uint16_t qtype, uint16_t id)
+static struct udp_resp *udp_resp_create(int query_id,
+                                        const struct sockaddr *addr,
+                                        curl_socklen_t addrlen,
+                                        const unsigned char *qbuf, size_t qlen,
+                                        uint16_t qtype, uint16_t id)
 {
   struct udp_resp *resp;
   timediff_t delay_ms = 0;
@@ -803,7 +803,7 @@ udp_resp_create(int query_id,
 
   resp->query_id = query_id;
   /* on some platforms `curl_socklen_t` is an `int`. Casting might
-  * wrap this, but then it still has to fit our record size. */
+   * wrap this, but then it still has to fit our record size. */
   if((size_t)addrlen > sizeof(resp->addr)) {
     logmsg("[%d-UDP] unable to handle addrlen of %zu",
            query_id, (size_t)addrlen);
diff --git a/tests/server/util.c b/tests/server/util.c
index b2e4d4535f..c4ea559855 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -326,7 +326,7 @@ storerequest_cleanup:
            errno, curlx_strerror(errno, errbuf, sizeof(errbuf)));
 }
 
-static bool initiate_exit(int signum)  /* stay signal-safe */
+static bool initiate_exit(int signum)  /* keep signal-safe */
 {
   if(got_exit_signal == 0) {
     got_exit_signal = 1;
@@ -371,7 +371,7 @@ static SIGHANDLER_T old_sigterm_handler = SIG_ERR;
  * the POSIX specification:
  *   https://pubs.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_04.html#tag_02_04_03
  */
-static void exit_signal_handler(int signum)  /* stay signal-safe */
+static void exit_signal_handler(int signum)  /* keep signal-safe */
 {
   int old_errno = errno;
   exit_msg = "exit_signal_handler(): triggered";
@@ -421,7 +421,7 @@ static SIGHANDLER_T set_signal(int signum, SIGHANDLER_T handler, int norestart)
  * application, such as one in UNIX, to become multi-threaded and cause
  * unexpected behavior.
  */
-static BOOL WINAPI ctrl_event_handler(DWORD dwCtrlType)  /* stay signal-safe */
+static BOOL WINAPI ctrl_event_handler(DWORD dwCtrlType)  /* keep signal-safe */
 {
   static const char msgU[] = "ctrl_event_handler(): unhandled\n";
   static const char msgH[] = "ctrl_event_handler(): handled\n";
@@ -1111,6 +1111,7 @@ int open_stream_sock(curl_socket_t *psock, uint16_t *pport)
       result = 1;
       goto out;
     }
+
     switch(localaddr.sa.sa_family) {
     case AF_INET:
       port = ntohs(localaddr.sa4.sin_port);