diff --git a/Doc/library/compression.zstd.rst b/Doc/library/compression.zstd.rst
index 89b6fe540f5ba7..7ca843f27f5e9a 100644
--- a/Doc/library/compression.zstd.rst
+++ b/Doc/library/compression.zstd.rst
@@ -73,7 +73,7 @@ Reading and writing compressed files
    argument is not None, a :exc:`!TypeError` will be raised.
 
    When writing, the *options* argument can be a dictionary
-   providing advanced decompression parameters; see
+   providing advanced compression parameters; see
    :class:`CompressionParameter` for detailed information about supported
    parameters. The *level* argument is the compression level to use when
    writing compressed data. Only one of *level* or *options* may be non-None.
@@ -117,7 +117,7 @@ Reading and writing compressed files
    argument is not None, a :exc:`!TypeError` will be raised.
 
    When writing, the *options* argument can be a dictionary
-   providing advanced decompression parameters; see
+   providing advanced compression parameters; see
    :class:`CompressionParameter` for detailed information about supported
    parameters. The *level* argument is the compression level to use when
    writing compressed data. Only one of *level* or *options* may be passed. The
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
index dc4248655b4b2d..d5a2e04958e8a8 100644
--- a/Doc/whatsnew/3.15.rst
+++ b/Doc/whatsnew/3.15.rst
@@ -1412,7 +1412,7 @@ that may require changes to your code.
   :func:`resource.setrlimit` and :func:`resource.prlimit` is now deprecated.
   (Contributed by Serhiy Storchaka in :gh:`137044`.)
 
-* :meth:`~mmap.mmap.resize` has been removed on platforms that don't support the
+* :meth:`mmap.mmap.resize` has been removed on platforms that don't support the
   underlying syscall, instead of raising a :exc:`SystemError`.
 
 * A resource warning is now emitted for an unclosed
diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py
index baf03ef6cd95ee..00dcbdc562ae64 100644
--- a/Lib/test/test_pyrepl/test_pyrepl.py
+++ b/Lib/test/test_pyrepl/test_pyrepl.py
@@ -1991,6 +1991,17 @@ def test_no_newline(self):
             safe_patterns.append(r'\x1b\[\?25[hl]')  # cursor visibility
             safe_patterns.append(r'\x1b\[\?12[hl]')  # cursor blinking
 
+        # rmam / smam - automatic margins
+        rmam = ti.get("rmam")
+        smam = ti.get("smam")
+        if rmam:
+            safe_patterns.append(re.escape(rmam.decode("ascii")))
+        if smam:
+            safe_patterns.append(re.escape(smam.decode("ascii")))
+        if not rmam and not smam:
+            safe_patterns.append(r'\x1b\[\?7l') # turn off automatic margins
+            safe_patterns.append(r'\x1b\[\?7h') # turn on automatic margins
+
         # Modern extensions not in standard terminfo - always use patterns
         safe_patterns.append(r'\x1b\[\?2004[hl]')  # bracketed paste mode
         safe_patterns.append(r'\x1b\[\?12[hl]')  # cursor blinking (may be separate)
diff --git a/Python/traceback.c b/Python/traceback.c
index 40e19c7cc82075..74360a1c73c271 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -1186,7 +1186,7 @@ _Py_DumpTraceback(int fd, PyThreadState *tstate)
 
 
 // Write the thread name
-static void
+static void _Py_NO_SANITIZE_THREAD
 write_thread_name(int fd, PyThreadState *tstate)
 {
 #ifndef MS_WINDOWS
@@ -1239,7 +1239,7 @@ write_thread_name(int fd, PyThreadState *tstate)
 
    This function is signal safe (except on Windows). */
 
-static void
+static void _Py_NO_SANITIZE_THREAD
 write_thread_id(int fd, PyThreadState *tstate, int is_current)
 {
     if (is_current)