diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 92ba365f8..f7ed7ffda 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -56,6 +56,7 @@ include_directories(
      ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
      ${ARMADILLO_INCLUDE_DIRS}
      ${GLOG_INCLUDE_DIRS}
+     ${GFlags_INCLUDE_DIRS}
      ${Boost_INCLUDE_DIRS}
 )
 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 6695dfced..bdf6c3dea 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -17,6 +17,10 @@
 #
 
 set(GTEST_DIR_LOCAL $ENV{GTEST_DIR})
+if(NOT EXISTS GTEST_DIR_LOCAL)
+    set(GTEST_DIR_LOCAL false)
+endif(NOT EXISTS GTEST_DIR_LOCAL)
+
 
 if(NOT GTEST_DIR_LOCAL)
      # if GTEST_DIR is not defined, we download and build it