diff --git a/Apps/FiniteDefElasticity/CMakeLists.txt b/Apps/FiniteDefElasticity/CMakeLists.txt
index aa20c396..0dff047b 100644
--- a/Apps/FiniteDefElasticity/CMakeLists.txt
+++ b/Apps/FiniteDefElasticity/CMakeLists.txt
@@ -49,27 +49,36 @@ FIND_PACKAGE(ARPACK REQUIRED)
 FIND_PACKAGE(IFEM REQUIRED)
 
 # Optional packages
+IF(NOT "${DISABLE_LRSPLINE}")
+  FIND_PACKAGE(LRSpline)
+ENDIF(NOT "${DISABLE_LRSPLINE}")
+
 IF(${ENABLE_PETSC})
   FIND_PACKAGE(Petsc)
 ENDIF(${ENABLE_PETSC})
+
 IF(NOT "${DISABLE_SUPERLU}")
   FIND_PACKAGE(SuperLU)
 ENDIF(NOT "${DISABLE_SUPERLU}")
+
 IF(${ENABLE_SPR})
   FIND_PACKAGE(SPR)
 ENDIF(${ENABLE_SPR})
+
 IF(${ENABLE_SAMG})
   FIND_PACKAGE(SAMG)
 ENDIF(${ENABLE_SAMG})
+
 FIND_PACKAGE(VTFWriter)
-IF(NOT "${DISABLE_HDF5}")
-  FIND_PACKAGE(HDF5)
-ENDIF(NOT "${DISABLE_HDF5}")
 
 IF(VTFAPI GREATER 1)
   SET(IFEM_LIBRARIES -Wl,--whole-archive ${IFEM_LIBRARIES} -Wl,--no-whole-archive)
 ENDIF(VTFAPI GREATER 1)
 
+IF(NOT "${DISABLE_HDF5}")
+  FIND_PACKAGE(HDF5)
+ENDIF(NOT "${DISABLE_HDF5}")
+
 # Required libraries
 SET(DEPLIBS ${IFEM_LIBRARIES}
   ${GoTrivariate_LIBRARIES} ${GoTools_LIBRARIES}
@@ -77,14 +86,11 @@ SET(DEPLIBS ${IFEM_LIBRARIES}
   ${Boost_LIBRARIES} ${LANGUAGE_LIBS}
 )
 
-# MKL
-IF(CMAKE_CXX_COMPILER MATCHES icpc)
-  FIND_PACKAGE(MKL REQUIRED)
-  SET(DEPLIBS ${DEPSLIBS} ${MKL_LIBRARIES})
-  SET(INCLUDES ${INCLUDES} ${MKL_INCLUDES})
-ENDIF(CMAKE_CXX_COMPILER MATCHES icpc)
-
 # Optional libraries
+IF(LRSpline_LIBRARIES)
+  SET(DEPLIBS ${DEPLIBS} ${LRSpline_LIBRARIES})
+ENDIF(LRSpline_LIBRARIES)
+
 IF(SuperLU_MT_LIBRARIES AND "${ENABLE_SUPERLU_MT}")
   FIND_PACKAGE(Threads REQUIRED)
   SET(DEPLIBS ${DEPLIBS} ${SuperLU_MT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
@@ -123,6 +129,13 @@ IF(HDF5_LIBRARIES)
   SET(DEPLIBS ${DEPLIBS} ${HDF5_LIBRARIES})
 ENDIF(HDF5_LIBRARIES)
 
+# MKL (when using the Intel compilers)
+IF(CMAKE_CXX_COMPILER MATCHES icpc)
+  FIND_PACKAGE(MKL REQUIRED)
+  SET(DEPLIBS ${DEPSLIBS} ${MKL_LIBRARIES})
+  SET(INCLUDES ${INCLUDES} ${MKL_INCLUDES})
+ENDIF(CMAKE_CXX_COMPILER MATCHES icpc)
+
 INCLUDE_DIRECTORIES(${IFEM_INCLUDES} ${PROJECT_SOURCE_DIR}/../LinearElasticity)
 
 SET(EXECUTABLE_OUTPUT_PATH bin)
diff --git a/cmake/Modules/FindSuperLU.cmake b/cmake/Modules/FindSuperLU.cmake
index 845bd894..eb3f2da2 100644
--- a/cmake/Modules/FindSuperLU.cmake
+++ b/cmake/Modules/FindSuperLU.cmake
@@ -1,5 +1,5 @@
 IF(SuperLU_INCLUDES AND SuperLU_LIBRARIES)
-  SET(SUPERLU_FIND_QUIETLY TRUE)
+  SET(SuperLU_FIND_QUIETLY TRUE)
 ENDIF(SuperLU_INCLUDES AND SuperLU_LIBRARIES)
 
 FIND_PATH(SuperLU_INCLUDES