diff --git a/Ghidra/Features/Base/src/main/help/help/topics/AutoAnalysisPlugin/AutoAnalysis.htm b/Ghidra/Features/Base/src/main/help/help/topics/AutoAnalysisPlugin/AutoAnalysis.htm
index fc1f56ae04..18ca350367 100644
--- a/Ghidra/Features/Base/src/main/help/help/topics/AutoAnalysisPlugin/AutoAnalysis.htm
+++ b/Ghidra/Features/Base/src/main/help/help/topics/AutoAnalysisPlugin/AutoAnalysis.htm
@@ -398,7 +398,7 @@
 				in this Ghidra option text field the following text to use the <CODE>rust</CODE>
 				format: <CODE>-s rust</CODE>.  This is not needed for
 				normal operation.   To see a full list of supported options, query each demangler
-				directly sing the <CODE>--help</CODE> switch.
+				directly using the <CODE>--help</CODE> switch.
 			</P>
 			<P>
 				The GNU demanglers can be found at: 
@@ -421,8 +421,9 @@
 					please understand the risks associated with using that version of the 
 					software.   The <CODE>demangler_gnu_v2_24</CODE> version of the
 					demangler is a modified version of GNU's <CODE>c++filt (v2.24)</CODE>.  The
-					original version has known vulnerabilities which have been mitigated in 
-					the version created for Ghidra. 
+					original version has known vulnerabilities, some of which have been 
+					mitigated in the version created for Ghidra.  Use caution when enabling this
+					feature.
 				</P>
 			</BLOCKQUOTE>
 		
diff --git a/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java b/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
index ec7bceda67..27905e7adf 100644
--- a/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
+++ b/Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
@@ -1035,7 +1035,7 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
 	}
 
 	@Test
-	public void testBob() throws Exception {
+	public void testTemplatesThatContainFunctionSignatures() throws Exception {
 		//
 		// Mangled: _ZNSt6vectorIN5boost8functionIFvvEEESaIS3_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS3_S5_EERKS3_
 		// 
@@ -1134,7 +1134,7 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
 		assertNull(res);
 	}
 
-	@Test
+	// @Test TODO upcoming fix for GT-3545
 	public void testFunctionWithLambda_WrappingAnotherFunctionCall() throws Exception {
 
 		//