diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c8cae8..912cd7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(msckf_vio)
 
-add_compile_options(-std=c++11 -Wall)
+add_compile_options(-std=c++11)
 
 # Modify cmake module path if new .cmake files are required
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")
diff --git a/cmake/FindSPQR.cmake b/cmake/FindSPQR.cmake
index 40e8807..cf863c5 100644
--- a/cmake/FindSPQR.cmake
+++ b/cmake/FindSPQR.cmake
@@ -1,7 +1,7 @@
 # SPQR lib usually requires linking to a blas and lapack library.
 # It is up to the user of this module to find a BLAS and link to it.
 
-# SPQR lib requires Cholmod, colamd and amd as well. 
+# SPQR lib requires Cholmod, colamd and amd as well.
 # FindCholmod.cmake can be used to find those packages before finding spqr
 
 if (SPQR_INCLUDES AND SPQR_LIBRARIES)
@@ -23,11 +23,11 @@ find_library(SPQR_LIBRARIES spqr $ENV{SPQRDIR} ${LIB_INSTALL_DIR})
 
 if(SPQR_LIBRARIES)
 
-  find_library(SUITESPARSE_LIBRARY SuiteSparse PATHS $ENV{SPQRDIR} ${LIB_INSTALL_DIR})
-  if (SUITESPARSE_LIBRARY)
-    set(SPQR_LIBRARIES ${SPQR_LIBRARIES} ${SUITESPARSE_LIBRARY})
-  endif (SUITESPARSE_LIBRARY)
-  
+  find_library(SUITESPARSECONFIG_LIBRARY NAMES suitesparseconfig PATHS $ENV{SPQRDIR} ${LIB_INSTALL_DIR})
+  if (SUITESPARSECONFIG_LIBRARY)
+    set(SPQR_LIBRARIES ${SPQR_LIBRARIES} ${SUITESPARSECONFIG_LIBRARY})
+  endif (SUITESPARSECONFIG_LIBRARY)
+
 endif(SPQR_LIBRARIES)
 
 include(FindPackageHandleStandardArgs)