diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2fd5ea..b0c7b0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ set (CMAKE_CXX_STANDARD 17)
 if (MSVC)
    add_definitions (/W3)
    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-elseif (CMAKE_COMPILER_IS_GNUCXX)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-unknown-pragmas -fPIC")
+elseif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -fPIC")
 else()
    message (FATAL_ERROR "Unknown compiler")
    return()
diff --git a/psvpfsparser/Utils.cpp b/psvpfsparser/Utils.cpp
index a4c1aa4..f0653d3 100644
--- a/psvpfsparser/Utils.cpp
+++ b/psvpfsparser/Utils.cpp
@@ -67,13 +67,13 @@ void getFileListNoPfs(std::filesystem::path root_path, std::set<std::filesystem:
 
          //skip pfs directory
          if(cp.filename() == std::filesystem::path("sce_pfs")) {
-            i.pop();
+            i.disable_recursion_pending();
             continue;
          }
 
          //skip packages
          if(cp == (root_path / std::filesystem::path("sce_sys/package"))) {
-            i.pop();
+            i.disable_recursion_pending();
             continue;
          }
 
@@ -81,7 +81,7 @@ void getFileListNoPfs(std::filesystem::path root_path, std::set<std::filesystem:
          if(cp.filename() == "sce_sys" &&
                cp != root_path / std::filesystem::path("sce_sys") &&
                std::filesystem::exists(cp / std::filesystem::path("keystone"))) {
-            i.pop();
+            i.disable_recursion_pending();
             continue;
          }