diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4421b7285..b9d65285a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -25,7 +25,7 @@
 # These owners will be the default owners for all the files in the
 # repository.  Unless a later match is found, these owners
 # will be requested for a review when a PR is opened.
-*          @thomas-robinson @bensonr @rem1776
+*          @uramirez8707 @bensonr @rem1776
 
 # GNU autotools files
 Makefile.am      @uramirez8707 @rem1776
@@ -41,7 +41,7 @@ cmake            @mlee03
 /.github/        @rem1776
 
 # Testing files
-/test_fms/       @uramirez8707 @mlee03 @bensonr @thomas-robinson @rem1776
+/test_fms/       @uramirez8707 @mlee03 @bensonr @rem1776
 
 # Specific component directories
 /affinity/          @bensonr
@@ -53,15 +53,15 @@ cmake            @mlee03
 #/data_override/ Currently no code owner
 /test_fms/data_override/ @rem1776
 
-/diag_manager            @thomas-robinson
-/test_fms/diag_manager/  @thomas-robinson
+/diag_manager            @uramirez8707
+/test_fms/diag_manager/  @uramirez8707
 
-/fms/             @thomas-robinson @rem1776
-/test_fms/fms/    @thomas-robinson @rem1776
+/fms/             @uramirez8707 @rem1776
+/test_fms/fms/    @uramirez8707 @rem1776
 /fms2/            @uramirez8707
 /test_fms/fms2/   @uramirez8707
 
-/libFMS/           @thomas-robinson @rem1776
+/libFMS/           @uramirez8707 @rem1776
 
-/mpp/              @thomas-robinson @bensonr
-/test_fms/mpp/     @thomas-robinson @bensonr @rem1776
+/mpp/              @uramirez8707 @bensonr
+/test_fms/mpp/     @uramirez8707 @bensonr @rem1776
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5082a98e0..9bca8c46c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -429,13 +429,13 @@ endforeach()
 install(
   TARGETS ${LIB_TARGETS}
   EXPORT FMSExports
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib)
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 ### Package config
 include(CMakePackageConfigHelpers)
-set(CONFIG_INSTALL_DESTINATION lib/cmake/fms)
+set(CONFIG_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/fms)
 
 export(EXPORT FMSExports
   NAMESPACE FMS::
diff --git a/parser/yaml_parser.F90 b/parser/yaml_parser.F90
index 3a3c7f005..a34c5d4e2 100644
--- a/parser/yaml_parser.F90
+++ b/parser/yaml_parser.F90
@@ -76,7 +76,7 @@ function open_and_parse_file_wrap(filename, file_id) bind(c) &
    use iso_c_binding, only: c_char, c_int, c_bool
    character(kind=c_char), intent(in) :: filename(*) !< Filename of the yaml file
    integer(kind=c_int), intent(out) :: file_id !< File id corresponding to the yaml file that was opened
-   logical(kind=c_int) :: error_code !< Flag indicating the error message (1 if sucessful)
+   integer(kind=c_int) :: error_code !< Flag indicating the error message (1 if sucessful)
 end function open_and_parse_file_wrap
 
 !> @brief Private c function that checks if a file_id is valid (see yaml_parser_binding.c)
diff --git a/test_fms/data_override/test_data_override2_ongrid.sh b/test_fms/data_override/test_data_override2_ongrid.sh
index 4f4bc7db8..104a5a874 100755
--- a/test_fms/data_override/test_data_override2_ongrid.sh
+++ b/test_fms/data_override/test_data_override2_ongrid.sh
@@ -67,7 +67,6 @@ fi
 [ ! -d "INPUT" ] && mkdir -p "INPUT"
 for KIND in r4 r8
 do
-rm -rf INPUT/*
 sed -e 's/halo_size/2/g ; s/write_only = .False./write_only = .True./g' input_base.nml > input.nml
 
 test_expect_success "Creating input files (${KIND})" '
diff --git a/test_fms/data_override/test_data_override_ongrid.F90 b/test_fms/data_override/test_data_override_ongrid.F90
index e9ddcff28..d8e3864ba 100644
--- a/test_fms/data_override/test_data_override_ongrid.F90
+++ b/test_fms/data_override/test_data_override_ongrid.F90
@@ -35,7 +35,6 @@ program test_data_override_ongrid
                              nf90_close, nf90_put_att, nf90_clobber, nf90_64bit_offset, nf90_char, &
                              nf90_double, nf90_unlimited
 use ensemble_manager_mod, only: get_ensemble_size, ensemble_manager_init
-
 use fms_mod, only: string, fms_init, fms_end
 
 implicit none
@@ -62,7 +61,6 @@ program test_data_override_ongrid
 integer, allocatable                       :: pelist_ens(:)
 integer                                    :: ensemble_id
 logical                                    :: write_only=.false. !< True if creating the input files only
-                                                                 !! False if running the tests only
 
 namelist / test_data_override_ongrid_nml / nhalox, nhaloy, test_case, nlon, nlat, layout, write_only