diff --git a/cmake/Modules/FindIFEM.cmake b/cmake/Modules/FindIFEM.cmake
index 282200ee..1b0430da 100644
--- a/cmake/Modules/FindIFEM.cmake
+++ b/cmake/Modules/FindIFEM.cmake
@@ -2,48 +2,48 @@ IF(IFEM_INCLUDES AND IFEM_LIBRARIES)
   SET(IFEM_FIND_QUIETLY TRUE)
 ENDIF(IFEM_INCLUDES AND IFEM_LIBRARIES)
 
-IF(NOT DEFINED FORCE_SYSTEM_IFEM OR NOT ${FORCE_SYSTEM_IFEM})
+IF(NOT DEFINED FORCE_SYSTEM_IFEM OR NOT "${FORCE_SYSTEM_IFEM}")
   FIND_PATH(IFEM_INCLUDES
-            NAMES
-            SIMbase.h
-            PATHS
-            ${PROJECT_SOURCE_DIR}/../../src/
-            PATH_SUFFIXES SIM)
-ENDIF(NOT DEFINED FORCE_SYSTEM_IFEM OR NOT ${FORCE_SYSTEM_IFEM})
+    NAMES ASMbase.h
+    PATHS ${PROJECT_SOURCE_DIR}/../../src/ASM)
+ENDIF(NOT DEFINED FORCE_SYSTEM_IFEM OR NOT "${FORCE_SYSTEM_IFEM}")
 
-# Build is in-tree
 IF(IFEM_INCLUDES)
-  SET(IFEM_INCLUDES
-      ${PROJECT_SOURCE_DIR}/../../src/ASM
-      ${PROJECT_SOURCE_DIR}/../../src/Eig
-      ${PROJECT_SOURCE_DIR}/../../src/Integrands
-      ${PROJECT_SOURCE_DIR}/../../src/LinAlg
-      ${PROJECT_SOURCE_DIR}/../../src/SIM
-      ${PROJECT_SOURCE_DIR}/../../src/Utility)
+  # Build is in-tree
   MESSAGE(STATUS "Using in-tree libIFEM")
-  FIND_LIBRARY(IFEM_LIBRARIES 
-               IFEM
-               PATHS
-               ${PROJECT_SOURCE_DIR}/../../${CMAKE_BUILD_TYPE}/lib
-               ${PROJECT_SOURCE_DIR}/../../lib
-               NO_DEFAULT_PATH)
+
+  FIND_PATH(Int_INCL AnaSol.h  ${PROJECT_SOURCE_DIR}/../../src/Integrands)
+  FIND_PATH(SIM_INCL SIMbase.h ${PROJECT_SOURCE_DIR}/../../src/SIM)
+  FIND_PATH(Alg_INCL MatVec.h  ${PROJECT_SOURCE_DIR}/../../src/LinAlg)
+  FIND_PATH(Utl_INCL Vec3.h    ${PROJECT_SOURCE_DIR}/../../src/Utility)
+  SET(IFEM_INCLUDES ${IFEM_INCLUDES}
+    ${Int_INCL} ${SIM_INCL} ${Alg_INCL} ${Utl_INCL})
+
+  FIND_LIBRARY(IFEM_LIBRARIES
+    NAMES IFEM
+    PATHS ${PROJECT_SOURCE_DIR}/../../${CMAKE_BUILD_TYPE}/lib
+    ${PROJECT_SOURCE_DIR}/../../lib
+    NO_DEFAULT_PATH)
   IF(NOT IFEM_LIBRARIES)
-    MESSAGE(WARNING "Could not find the in-tree libIFEM library, we assume "
-                    "it will be built into a build-type dir")
+    MESSAGE(WARNING "Could not find the in-tree libIFEM library, "
+      "we assume it will be built into a build-type dir")
     SET(IFEM_LIBRARIES ${PROJECT_SOURCE_DIR}/../../${CMAKE_BUILD_TYPE}/lib/libIFEM.a)
   ENDIF(NOT IFEM_LIBRARIES)
+
 ELSE(IFEM_INCLUDES)
-  MESSAGE(STATUS "No in-tree libIFEM found, looking for system library")
+  IF(NOT DEFINED FORCE_SYSTEM_IFEM OR NOT "${FORCE_SYSTEM_IFEM}")
+    MESSAGE(STATUS "No in-tree libIFEM found, looking for system library")
+  ENDIF(NOT DEFINED FORCE_SYSTEM_IFEM OR NOT "${FORCE_SYSTEM_IFEM}")
+
   FIND_PATH(IFEM_INCLUDES
-            NAMES
-            SIMbase.h
-            PATHS
-            $ENV{HOME}/include
-            PATH_SUFFIXES IFEM)
-  FIND_LIBRARY(IFEM_LIBRARIES 
-               IFEM
-               PATHS
-               $ENV{HOME}/lib)
+    NAMES SIMbase.h
+    PATHS $ENV{HOME}/include
+    PATH_SUFFIXES IFEM)
+
+  FIND_LIBRARY(IFEM_LIBRARIES
+    NAMES IFEM
+    PATHS $ENV{HOME}/lib)
+
 ENDIF(IFEM_INCLUDES)
 
 INCLUDE(FindPackageHandleStandardArgs)
diff --git a/cmake/Modules/FindSuperLU.cmake b/cmake/Modules/FindSuperLU.cmake
index cab1f322..845bd894 100644
--- a/cmake/Modules/FindSuperLU.cmake
+++ b/cmake/Modules/FindSuperLU.cmake
@@ -13,7 +13,7 @@ FIND_PATH(SuperLU_MT_INCLUDES
   NAMES pdsp_defs.h
   PATHS $ENV{HOME}/include
   /sima/libs/SuperLU_MT/include
-  PATH_SUFFIXES superlu
+  PATH_SUFFIXES superlu_mt superlu
 )
 
 FIND_LIBRARY(SuperLU_LIBRARIES
@@ -25,7 +25,7 @@ FIND_LIBRARY(SuperLU_LIBRARIES
 FIND_LIBRARY(SuperLU_MT_LIBRARIES
   NAMES superlu_mt
   PATHS $ENV{HOME}/lib
-  /sima/libs/SuperLU_MT/lib           
+  /sima/libs/SuperLU_MT/lib
 )
 
 INCLUDE(FindPackageHandleStandardArgs)