diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a901f76..19af412f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,15 +123,12 @@ endif()
 ### Definitions
 
 target_compile_definitions(ccls PRIVATE
-                           LOGURU_WITH_STREAMS=1
-                           LOGURU_FILENAME_WIDTH=18
-                           LOGURU_THREADNAME_WIDTH=13
                            DEFAULT_RESOURCE_DIRECTORY="${Clang_RESOURCE_DIR}")
 
 ### Includes
 
-target_include_directories(ccls PRIVATE
-                           src
+target_include_directories(ccls PRIVATE src)
+target_include_directories(ccls SYSTEM PRIVATE
                            third_party
                            third_party/rapidjson/include)
 
diff --git a/src/match.cc b/src/match.cc
index 58a6f73d..5dd46727 100644
--- a/src/match.cc
+++ b/src/match.cc
@@ -25,7 +25,7 @@ std::optional<Matcher> Matcher::Create(const std::string& search) {
         // std::regex_constants::nosubs
     );
     return m;
-  } catch (std::exception e) {
+  } catch (const std::exception& e) {
     Out_ShowLogMessage out;
     out.display_type = Out_ShowLogMessage::DisplayType::Show;
     out.params.type = lsMessageType::Error;