diff --git a/CMake/Modules/FindGitSubversion.cmake b/CMake/Modules/FindGitSubversion.cmake
index c913c37a7..3ee6b053d 100644
--- a/CMake/Modules/FindGitSubversion.cmake
+++ b/CMake/Modules/FindGitSubversion.cmake
@@ -43,14 +43,14 @@ if(GIT_FOUND)
     set(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")
     set(ENV{LC_ALL} C)
 
-    execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${dir}/.git --work-tree=${dir} svn info
+    execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${dir}/.git svn info
       OUTPUT_VARIABLE ${prefix}_WC_INFO
       ERROR_VARIABLE Git_git_svn_info_error
       RESULT_VARIABLE Git_git_svn_info_result
       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     if(NOT ${Git_git_svn_info_result} EQUAL 0)
-      message(SEND_ERROR "Command \"${GIT_EXECUTABLE} --git-dir=${dir}/.git --work-tree=${dir} svn info\" failed with output:\n${Git_git_svn_info_error}")
+      message(SEND_ERROR "Command \"${GIT_EXECUTABLE} --git-dir=${dir}/.git svn info\" failed with output:\n${Git_git_svn_info_error}")
     else()
 
       string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
diff --git a/lib/fsk4hf/ft8b.f90 b/lib/fsk4hf/ft8b.f90
index 8dc307f21..6d762cecb 100644
--- a/lib/fsk4hf/ft8b.f90
+++ b/lib/fsk4hf/ft8b.f90
@@ -337,12 +337,10 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,napwid,       &
         xsnr=0.001
         if(xnoi.gt.0 .and. xnoi.lt.xsig) xsnr=xsig/xnoi-1.0
         xsnr=10.0*log10(xsnr)-27.0
-!###
         xsnr2=db(xsig/xbase - 1.0) - 32.0
 !        write(52,3052) f1,xdt,xsig,xnoi,xbase,xsnr,xsnr2
 !3052    format(7f10.2)
-        xsnr=xsnr2
-!###
+        if(.not.nagain) xsnr=xsnr2
         if(xsnr .lt. -24.0) xsnr=-24.0
         return
      endif
diff --git a/mainwindow.cpp b/mainwindow.cpp
index c0fb9408d..e28331ac4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2834,7 +2834,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
         && !message_words.at (1).contains (QRegularExpression {"(^(CQ|QRZ))|" + m_baseCall})
         && message_words.at (2).contains (Radio::base_callsign (ui->dxCallEntry->text ()))) {
       // auto stop to avoid accidental QRM
-      auto_tx_mode (false);
+      ui->stopTxButton->click (); // halt any transmission
     }
     else if (m_auto             // transmit allowed
         && ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked() // auto-sequencing allowed
diff --git a/mainwindow.ui b/mainwindow.ui
index 89b4469bd..04e01d7b8 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -828,7 +828,7 @@ QLabel[oob="true"] {
                    <item>
                     <widget class="QCheckBox" name="cbTxLock">
                      <property name="toolTip">
-                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tx frequency tracks Rx frequency. &lt;/p&gt;&lt;p&gt;Not recommeded for general use!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tx frequency tracks Rx frequency. &lt;/p&gt;&lt;p&gt;Not recommended for general use!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                      </property>
                      <property name="text">
                       <string>Lock Tx=Rx</string>
@@ -1249,7 +1249,7 @@ QLabel[oob=&quot;true&quot;] {
                       </size>
                      </property>
                      <property name="toolTip">
-                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type2 compound call holders)&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repititions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type2 compound call holders)&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repetitions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                      </property>
                      <property name="text">
                       <string>Tx &amp;4</string>