diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2230df088f68285267052f9c8970cd04ec7457fe..1f817b420aacdb78966d516f5e01889d6e0beaf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,14 +6,12 @@ mac_x64:
   - mac_x64
   stage: build
   before_script:
-  - export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"
-  - export LDFLAGS="-L/usr/local/opt/flex/lib -L/usr/local/opt/bison/lib"
-  - export CPPFLAGS="-I/usr/local/opt/flex/include"
+  - PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"
   script:
   - OPTDIR=/Users/Shared/Software
   - mkdir pub/build
   - cd pub/build
-  - cmake -DCMAKE_PREFIX_PATH="$OPTDIR" -S ..
+  - cmake -DCMAKE_PREFIX_PATH="$OPTDIR" -DCMAKE_BUILD_TYPE=Release -S ..
   - make -j4
   - ctest --output-on-failure --timeout 120
   artifacts:
diff --git a/pub/lib/CMakeLists.txt b/pub/lib/CMakeLists.txt
index 4375bbf64bda436bfab3e03a8a821824c7b9ee93..df027cdbdc6ca5d912a2dce05466ddbb83b22584 100644
--- a/pub/lib/CMakeLists.txt
+++ b/pub/lib/CMakeLists.txt
@@ -10,7 +10,8 @@ flex_target(xaxlex
     xax_lex.lpp  ${CMAKE_CURRENT_BINARY_DIR}/xax_lex.cpp COMPILE_FLAGS "-Pxax" )
 add_flex_bison_dependency(xaxlex xaxyacc)
 
-include_directories(${Frida_SOURCE_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS})
+include_directories(${Frida_SOURCE_DIR}/lib
+    ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${KWW_INCLUDE_DIR})
 
 configure_file("config.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.hpp")
 
diff --git a/pub/lib/fastyamlloader.hpp b/pub/lib/fastyamlloader.hpp
index 47fd737f59376a9c9d45d94d71319858768949b3..e1d27f33287e4ac72f80260a1ffced6948cce7e7 100644
--- a/pub/lib/fastyamlloader.hpp
+++ b/pub/lib/fastyamlloader.hpp
@@ -17,6 +17,7 @@
 #include <cmath>
 #include <map>
 #include <memory>
+#include <vector>
 #include <yaml.h>
 
 #include <boost/multi_index/hashed_index.hpp>