diff --git a/BuildSetup.cmake b/BuildSetup.cmake
index 451e72a28..dd787df1b 100644
--- a/BuildSetup.cmake
+++ b/BuildSetup.cmake
@@ -45,7 +45,7 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
     set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -O2" )
     set( CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} -O3" )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror=return-type -Werror=deprecated" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -Werror=deprecated" )
     # Do not optimize for debug builds.  Do the same for RELWITHDEBINFO ?
     set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -O0 -g" )
     set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" )
@@ -185,14 +185,14 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
         set( CPACK_GENERATOR "DEB;TGZ" )
     else (${LINUX_DISTRO} MATCHES "RedHatEnterpriseServer")
         message( STATUS "Detected a Linux machine")
-        set( CPACK_GENERATOR "DEB;TGZ" )    
+        set( CPACK_GENERATOR "DEB;TGZ" )
     endif()
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
     set( CPACK_GENERATOR "NSIS;ZIP" )
     set( CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.md")
 endif()
 
-set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Applications for the GNSS processing GNSSTk toolkit.") 
+set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Applications for the GNSS processing GNSSTk toolkit.")
 set( CPACK_PACKAGE_VENDOR "ARL:UT SGL" )
 set( CPACK_PACKAGE_CONTACT "David Barber <dbarber@arlut.utexas.edu>" )
 set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md" )
@@ -201,7 +201,7 @@ set( CPACK_PACKAGE_VERSION_MINOR "${GNSSTK_VERSION_MINOR}" )
 set( CPACK_PACKAGE_VERSION_PATCH "${GNSSTK_VERSION_PATCH}" )
 set( CPACK_INCLUDE_TOPLEVEL_DIRECTORY "OFF" )
 set( CPACK_PACKAGE_INSTALL_DIRECTORY "gnsstk-apps${GNSSTK_VERSION_MAJOR}.${GNSSTK_VERSION_MINOR}${GNSSTK_VERSION_PATCH}" )
-set( CPACK_TOPLEVEL_TAG "gnsstk-apps" ) 
+set( CPACK_TOPLEVEL_TAG "gnsstk-apps" )
 
 set( CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.13), gnsstk (>= 11.0.0)" )
 set( CPACK_DEBIAN_SECTION "stable" )
diff --git a/core/apps/Rinextools/RinEditNav.cpp b/core/apps/Rinextools/RinEditNav.cpp
index bcca1fdfa..4a625daf7 100644
--- a/core/apps/Rinextools/RinEditNav.cpp
+++ b/core/apps/Rinextools/RinEditNav.cpp
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU Lesser General Public
 //  License along with GNSSTk; if not, write to the Free Software Foundation,
 //  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
-//  
+//
 //  This software was developed by Applied Research Laboratories at the
 //  University of Texas at Austin.
 //  Copyright 2004-2022, The Board of Regents of The University of Texas System
@@ -29,9 +29,9 @@
 //  within the U.S. Department of Defense. The U.S. Government retains all
 //  rights to use, duplicate, distribute, disclose, or release this software.
 //
-//  Pursuant to DoD Directive 523024 
+//  Pursuant to DoD Directive 523024
 //
-//  DISTRIBUTION STATEMENT A: This software has been approved for public 
+//  DISTRIBUTION STATEMENT A: This software has been approved for public
 //                            release, distribution is unlimited.
 //
 //==============================================================================
@@ -274,9 +274,9 @@ initialize(int argc, char *argv[], bool pretty) noexcept
          return false;
       }
    }
-   
+
    return true;
-}   
+}
 
 
 void RinEditNav ::
@@ -462,9 +462,8 @@ writeHeaders()
       for (const auto& i : dmi.first->header.mapIonoCorr)
       {
          merged.mapIonoCorr[i.first] = i.second;
-         merged.valid |= (
-            dmi.first->header.valid & (Rinex3NavHeader::validIonoCorrGPS |
-                                       Rinex3NavHeader::validIonoCorrGal));
+         merged.valid |= (dmi.first->header.valid
+                          & Rinex3NavHeader::validIonoCorr);
       }
          // attempt to determine the system or mixed from the input
       SatelliteSystem guessedSys;
diff --git a/core/apps/mergetools/mergeRinNav.cpp b/core/apps/mergetools/mergeRinNav.cpp
index a5605d0cd..b720cf5c1 100644
--- a/core/apps/mergetools/mergeRinNav.cpp
+++ b/core/apps/mergetools/mergeRinNav.cpp
@@ -130,11 +130,11 @@ void MergeRinNav::process()
    fff.unique(Rinex3NavDataOperatorEqualsFull());
 
       // set the pgm/runby/date field
-   merged.theHeader.fileType = string("NAVIGATION");
+   merged.theHeader.fileType = string("NAVIGATION DATA");
    merged.theHeader.fileProgram = std::string("mergeRinNav");
    merged.theHeader.fileAgency = std::string("gnsstk");
    merged.theHeader.date = CivilTime(SystemTime()).asString();
-   merged.theHeader.version = 2.1;
+   merged.theHeader.version = 3.04;
    merged.theHeader.valid |= gnsstk::Rinex3NavHeader::validVersion;
    merged.theHeader.valid |= gnsstk::Rinex3NavHeader::validRunBy;
    merged.theHeader.valid |= gnsstk::Rinex3NavHeader::validComment;