diff --git a/FindArmadillo.cmake b/FindArmadillo.cmake
index 972fa73d6233d51a1deb3d69ce111e288cf26499..106ec09e5bdd1f8908526d15bb5c7d3ba1776ffd 100644
--- a/FindArmadillo.cmake
+++ b/FindArmadillo.cmake
@@ -10,18 +10,18 @@ FIND_PATH(
     HINTS
         $ENV{ARMADILLO_INCLUDE_DIR}
         ${ARMADILLO_INCLUDE_DIR}
-        external_dependencies/armadillo/
+        ${ROOT_DIR}/external_dependencies/armadillo/
 
     PATHS
         /usr
-        /usr/local
         /home
-        /opt/local
+        /opt
 
     PATH_SUFFIXES
         include
         armadillo
         include/armadillo
+        local
 )
 
 # Is Armadillo downloaded locally?
@@ -41,7 +41,6 @@ if(LOCAL)
             armadillo
             "Armadillo was NOT found!"
             ARMADILLO_INCLUDE_DIR)
-
 else()
     # Find library
     set(LIBNAME ${LIB_PREFIX}armadillo.so)
@@ -55,8 +54,11 @@ else()
             external_dependencies/armadillo
 
         PATHS
-            /usr/lib
-            /usr/local/lib
+            /usr
+            /usr/local
+
+        PATH_SUFFIXES
+            lib
     )
 
     # Set ARMADILLO_FOUND honoring the QUIET and REQUIRED arguments
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc29c721b153770ae66744c979ae3fc9ba73e257..a238967264ceaede1b147038f5abee039c5a0fad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,7 +118,6 @@ if ("${BUILD_LIB}" STREQUAL "yes")
 
         PRIVATE
         ${Boost_INCLUDE_DIRS}
-        ${EXPRTK_INCLUDE_DIRECTORY}
     )
 
 endif ()