diff --git a/USER_MANUAL.html b/USER_MANUAL.html
index 3156bccc7..dcd9ac294 100644
--- a/USER_MANUAL.html
+++ b/USER_MANUAL.html
@@ -574,15 +574,15 @@ <h2 data-number="16.1" id="v1.8.6-december-2022"><span class="header-section-num
 <li>Build system:
 <ul>
 <li>Suppress documentation generation when tagging releases. (PR #314)</li>
-<li>Simplify build to reduce need for build scripts. (PR #305, #329)</li>
+<li>Simplify build to reduce need for build scripts. (PR #305, #329, #331)</li>
 </ul></li>
 <li>Bugfixes:
 <ul>
 <li>Filter out non-MME devices to match previous behavior. (PR #318)</li>
-<li>Use 64 bit int for frequency to enable reporting microwave frequencies. (PR #325)</li>
-<li>Resolves issue with minimum button sizing in the Filter dialog. (PR #326)</li>
+<li>Use 64 bit int for frequency to enable reporting microwave frequencies. (PR #325, #331)</li>
+<li>Resolves issue with minimum button sizing in the Filter dialog. (PR #326, #331)</li>
 <li>Update labling of clipping and BPF options to match actual behavior. (PR #319)</li>
-<li>Adjustss positioning and spacing of controls in the Options dialog to prevent truncation. (PR #328)(</li>
+<li>Adjustss positioning and spacing of controls in the Options dialog to prevent truncation. (PR #328, #331)</li>
 </ul></li>
 <li>Enhancements:
 <ul>
diff --git a/USER_MANUAL.md b/USER_MANUAL.md
index 00943125c..248216893 100644
--- a/USER_MANUAL.md
+++ b/USER_MANUAL.md
@@ -785,13 +785,13 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 
 1. Build system:
     * Suppress documentation generation when tagging releases. (PR #314)
-    * Simplify build to reduce need for build scripts. (PR #305, #329)
+    * Simplify build to reduce need for build scripts. (PR #305, #329, #331)
 2. Bugfixes:
     * Filter out non-MME devices to match previous behavior. (PR #318)
-    * Use 64 bit int for frequency to enable reporting microwave frequencies. (PR #325)
-    * Resolves issue with minimum button sizing in the Filter dialog. (PR #326)
+    * Use 64 bit int for frequency to enable reporting microwave frequencies. (PR #325, #331)
+    * Resolves issue with minimum button sizing in the Filter dialog. (PR #326, #331)
     * Update labling of clipping and BPF options to match actual behavior. (PR #319)
-    * Adjustss positioning and spacing of controls in the Options dialog to prevent truncation. (PR #328)(
+    * Adjustss positioning and spacing of controls in the Options dialog to prevent truncation. (PR #328, #331)
 3. Enhancements:
     * Add 2020B to multi-RX feature to enable RX and TX without restarting session. (PR #312)
     * Hide modes not on the SM1000 by default. (PR #313)
diff --git a/USER_MANUAL.pdf b/USER_MANUAL.pdf
index d40baeb59..4a7e9a529 100644
Binary files a/USER_MANUAL.pdf and b/USER_MANUAL.pdf differ
diff --git a/cross-compile/freedv-mingw-llvm-aarch64.cmake b/cross-compile/freedv-mingw-llvm-aarch64.cmake
index efb830a5c..cc9d603e3 100644
--- a/cross-compile/freedv-mingw-llvm-aarch64.cmake
+++ b/cross-compile/freedv-mingw-llvm-aarch64.cmake
@@ -11,6 +11,10 @@ set(CMAKE_AR ${triple}-ar)
 set(CMAKE_RANLIB ${triple}-ranlib)
 set(CMAKE_RC_COMPILER ${triple}-windres)
 
+set(CMAKE_C_FLAGS -gcodeview)
+set(CMAKE_CXX_FLAGS -gcodeview)
+set(CMAKE_EXE_LINKER_FLAGS -Wl,--pdb=)
+
 # For make package use.
 set(CMAKE_OBJDUMP ${triple}-objdump)
 set(FREEDV_USING_LLVM_MINGW 1)
diff --git a/cross-compile/freedv-mingw-llvm-armv7.cmake b/cross-compile/freedv-mingw-llvm-armv7.cmake
index 3af651e57..8445e23c6 100644
--- a/cross-compile/freedv-mingw-llvm-armv7.cmake
+++ b/cross-compile/freedv-mingw-llvm-armv7.cmake
@@ -12,6 +12,10 @@ set(CMAKE_AR ${triple}-ar)
 set(CMAKE_RANLIB ${triple}-ranlib)
 set(CMAKE_RC_COMPILER ${triple}-windres)
 
+set(CMAKE_C_FLAGS -gcodeview)
+set(CMAKE_CXX_FLAGS -gcodeview)
+set(CMAKE_EXE_LINKER_FLAGS -Wl,--pdb=)
+
 # For make package use.
 set(CMAKE_OBJDUMP ${triple}-objdump)
 set(FREEDV_USING_LLVM_MINGW 1)
diff --git a/cross-compile/freedv-mingw-llvm-i686.cmake b/cross-compile/freedv-mingw-llvm-i686.cmake
index ada234e7e..2322b5317 100644
--- a/cross-compile/freedv-mingw-llvm-i686.cmake
+++ b/cross-compile/freedv-mingw-llvm-i686.cmake
@@ -12,6 +12,10 @@ set(CMAKE_AR ${triple}-ar)
 set(CMAKE_RANLIB ${triple}-ranlib)
 set(CMAKE_RC_COMPILER ${triple}-windres)
 
+set(CMAKE_C_FLAGS -gcodeview)
+set(CMAKE_CXX_FLAGS -gcodeview)
+set(CMAKE_EXE_LINKER_FLAGS -Wl,--pdb=)
+
 # For make package use.
 set(CMAKE_OBJDUMP ${triple}-objdump)
 set(FREEDV_USING_LLVM_MINGW 1)
diff --git a/cross-compile/freedv-mingw-llvm-x86_64.cmake b/cross-compile/freedv-mingw-llvm-x86_64.cmake
index 38719d6a7..4e1972a4e 100644
--- a/cross-compile/freedv-mingw-llvm-x86_64.cmake
+++ b/cross-compile/freedv-mingw-llvm-x86_64.cmake
@@ -12,6 +12,10 @@ set(CMAKE_AR ${triple}-ar)
 set(CMAKE_RANLIB ${triple}-ranlib)
 set(CMAKE_RC_COMPILER ${triple}-windres)
 
+set(CMAKE_C_FLAGS -gcodeview)
+set(CMAKE_CXX_FLAGS -gcodeview)
+set(CMAKE_EXE_LINKER_FLAGS -Wl,--pdb=)
+
 # For make package use.
 set(CMAKE_OBJDUMP ${triple}-objdump)
 set(FREEDV_USING_LLVM_MINGW 1)
diff --git a/src/dlg_filter.cpp b/src/dlg_filter.cpp
index 96484bbaf..083ef2f0b 100644
--- a/src/dlg_filter.cpp
+++ b/src/dlg_filter.cpp
@@ -322,7 +322,7 @@ void FilterDlg::newLPCPFControl(wxSlider **slider, wxStaticText **stValue, wxWin
     *slider = new wxSlider(parent, wxID_ANY, 0, 0, SLIDER_MAX, wxDefaultPosition); 
     (*slider)->SetMinSize(wxSize(SLIDER_LENGTH,wxDefaultCoord));
 
-    bs->Add(*slider, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2);
+    bs->Add(*slider, 0, wxALL|wxEXPAND, 2);
 
     *stValue = new wxStaticText(parent, wxID_ANY, wxT("0.0"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
     bs->Add(*stValue, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL, 2);
diff --git a/src/dlg_options.cpp b/src/dlg_options.cpp
index 13cf707a8..79e5623c3 100644
--- a/src/dlg_options.cpp
+++ b/src/dlg_options.cpp
@@ -84,7 +84,7 @@ OptionsDlg::OptionsDlg(wxWindow* parent, wxWindowID id, const wxString& title, c
 
     m_txtCtrlCallSign = new wxTextCtrl(m_reportingTab, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0);
     m_txtCtrlCallSign->SetToolTip(_("Txt Msg you can send along with Voice"));
-    sbSizer_callSign->Add(m_txtCtrlCallSign, 0, wxALL | wxEXPAND | wxALIGN_CENTER_VERTICAL, 5);
+    sbSizer_callSign->Add(m_txtCtrlCallSign, 0, wxALL | wxEXPAND, 5);
 
     sizerReporting->Add(sbSizer_callSign,0, wxALL | wxEXPAND, 5);
  
@@ -266,7 +266,7 @@ OptionsDlg::OptionsDlg(wxWindow* parent, wxWindowID id, const wxString& title, c
     sbSizer_testFrames = new wxStaticBoxSizer(sb_testFrames, wxVERTICAL);
 
     m_ckboxTestFrame = new wxCheckBox(m_simulationTab, wxID_ANY, _("Test Frames"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
-    sbSizer_testFrames->Add(m_ckboxTestFrame, 0, wxALL | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 5);
+    sbSizer_testFrames->Add(m_ckboxTestFrame, 0, wxALL | wxALIGN_LEFT, 5);
 
     wxBoxSizer* channelNoiseSizer = new wxBoxSizer(wxHORIZONTAL);
 
@@ -334,7 +334,7 @@ OptionsDlg::OptionsDlg(wxWindow* parent, wxWindowID id, const wxString& title, c
     wxStaticBox* sb_udp = new wxStaticBox(m_interfacingTab, wxID_ANY, _("UDP Messages"));
     sbSizer_udp = new wxStaticBoxSizer(sb_udp, wxVERTICAL);
     m_ckbox_udp_enable = new wxCheckBox(m_interfacingTab, wxID_ANY, _("Enable UDP Messages"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
-    sbSizer_udp->Add(m_ckbox_udp_enable, 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
+    sbSizer_udp->Add(m_ckbox_udp_enable, 0, wxALL, 5);
 
     wxBoxSizer* portNumberSizer = new wxBoxSizer(wxHORIZONTAL);
     wxStaticText* udpPortNumberLabel = new wxStaticText(m_interfacingTab, wxID_ANY, _("UDP Port Number:"), wxDefaultPosition, wxDefaultSize, 0);
@@ -363,9 +363,9 @@ OptionsDlg::OptionsDlg(wxWindow* parent, wxWindowID id, const wxString& title, c
     sbSizer_console = new wxStaticBoxSizer(sb_console, wxHORIZONTAL);
 
     m_ckboxDebugConsole = new wxCheckBox(m_debugTab, wxID_ANY, _("Show Console"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
-    sbSizer_console->Add(m_ckboxDebugConsole, 0, wxALIGN_LEFT, 0);
+    sbSizer_console->Add(m_ckboxDebugConsole, 0, wxALIGN_LEFT, 5);
 
-    sizerDebug->Add(sbSizer_console,0, wxALL|wxEXPAND, 3);
+    sizerDebug->Add(sbSizer_console,0, wxALL|wxEXPAND, 5);
 #endif // __WXMSW__
     
     //----------------------------------------------------------
@@ -387,7 +387,7 @@ OptionsDlg::OptionsDlg(wxWindow* parent, wxWindowID id, const wxString& title, c
     // Reset stats button
     
     m_BtnFifoReset = new wxButton(m_debugTab, wxID_ANY, _("Reset"), wxDefaultPosition, wxDefaultSize, 0);
-    sbSizer_fifo1->Add(m_BtnFifoReset, 0,  wxALIGN_LEFT, 5);
+    sbSizer_fifo1->Add(m_BtnFifoReset, 0,  wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 5);
     sbSizer_fifo->Add(sbSizer_fifo1);
 
     // text lines with fifo counters
diff --git a/src/main.cpp b/src/main.cpp
index 706dc2f12..5ead03d8a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,7 @@
 //
 //==========================================================================
 
+#include <inttypes.h>
 #include <time.h>
 #include <vector>
 #include <deque>
@@ -931,7 +932,7 @@ MainFrame::~MainFrame()
     pConfig->Write(wxT("/PSKReporter/Callsign"), wxGetApp().m_psk_callsign);
     pConfig->Write(wxT("/PSKReporter/GridSquare"), wxGetApp().m_psk_grid_square);
 
-    wxString tempFreqStr = wxString::Format(wxT("%ld"), wxGetApp().m_psk_freq);
+    wxString tempFreqStr = wxString::Format(wxT("%" PRIu64), wxGetApp().m_psk_freq);
     pConfig->Write(wxT("/PSKReporter/FrequencyHzStr"), tempFreqStr);
     
     // Waterfall configuration