diff --git a/CMakeLists.txt b/CMakeLists.txt
index cae9ece74..43d761f55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -412,8 +412,9 @@ set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10")
 set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.10.1")
 
-if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7
-    set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")
+if(CMAKE_VERSION VERSION_LESS "3.0.2")
+    set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")  # Fix for CentOS 7
+    set(GNSSSDR_GLOG_LOCAL_VERSION "0.3.4")    # Fix for Ubuntu 14.04
 endif()
 
 
@@ -1191,11 +1192,10 @@ if(NOT GLOG_FOUND OR ${LOCAL_GFLAGS})
 
     if(CMAKE_VERSION VERSION_LESS 3.2)
         if(CMAKE_VERSION VERSION_LESS 3.0)
+            set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_LIBS})
             if(${LOCAL_GFLAGS})
-                set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_SHARED_LIBS})
                 set(GFLAGS_LIBRARY_DIR_TO_LINK ${CMAKE_CURRENT_BINARY_DIR}/gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION}/lib)
             else()
-                set(GFLAGS_LIBRARIES_TO_LINK ${GFlags_LIBS})
                 set(GFLAGS_LIBRARY_DIR_TO_LINK ${GFlags_LIBRARY_DIRS})
             endif()
             if(OS_IS_MACOSX)
diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc
index e35846656..cc289d480 100644
--- a/src/tests/system-tests/position_test.cc
+++ b/src/tests/system-tests/position_test.cc
@@ -155,7 +155,7 @@ int PositionSystemTest::generate_signal()
     else if (pid == 0)
         {
             execv(&generator_binary[0], parmList);
-            std::cout << "Return not expected. Must be an execv error." << std::endl;
+            std::cout << "Return not expected. Must be an execv error. Does " << generator_binary << " exist?" << std::endl;
             std::terminate();
         }
 
@@ -205,6 +205,7 @@ int PositionSystemTest::configure_receiver()
             const float pll_bw_hz = 35.0;
             const float dll_bw_hz = 1.5;
             const float early_late_space_chips = 0.5;
+            const float early_late_space_narrow_chips = 0.1;
             const float pll_bw_narrow_hz = 15.0;
             const float dll_bw_narrow_hz = 1.5;
             const int extend_correlation_symbols = FLAGS_extend_correlation_symbols;  // defaults to 1
@@ -298,7 +299,7 @@ int PositionSystemTest::configure_receiver()
             config->set_property("Tracking_1C.pll_bw_hz", std::to_string(pll_bw_hz));
             config->set_property("Tracking_1C.dll_bw_hz", std::to_string(dll_bw_hz));
             config->set_property("Tracking_1C.early_late_space_chips", std::to_string(early_late_space_chips));
-
+            config->set_property("Tracking_1C.early_late_space_narrow_chips", std::to_string(early_late_space_narrow_chips));
             config->set_property("Tracking_1C.pll_bw_narrow_hz", std::to_string(pll_bw_narrow_hz));
             config->set_property("Tracking_1C.dll_bw_narrow_hz", std::to_string(dll_bw_narrow_hz));
             config->set_property("Tracking_1C.extend_correlation_symbols", std::to_string(extend_correlation_symbols));
@@ -612,7 +613,7 @@ void PositionSystemTest::check_results()
             double precision_SEP = 0.51 * (sigma_E_2_precision + sigma_N_2_precision + sigma_U_2_precision);
 
             EXPECT_LT(static_2D_error_m, FLAGS_static_2D_error_m);
-            EXPECT_LT(static_2D_error_m, FLAGS_static_2D_error_m);
+            EXPECT_LT(static_3D_error_m, FLAGS_static_3D_error_m);
             ASSERT_LT(accuracy_CEP, FLAGS_accuracy_CEP);
             ASSERT_LT(precision_SEP, FLAGS_precision_SEP);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
index 38b1ea207..b9140b3cd 100644
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
@@ -1512,8 +1512,8 @@ void HybridObservablesTest::check_results_code_pseudorange(
                     ASSERT_LT(error_mean, 1.0);
                     ASSERT_GT(error_mean, -1.0);
                     ASSERT_LT(error_var, 10.0);
-                    ASSERT_LT(max_error, 10.0);
-                    ASSERT_GT(min_error, -10.0);
+                    ASSERT_LT(max_error, 15.0);
+                    ASSERT_GT(min_error, -15.0);
                 }
         }
     else