diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bee5e9422..825b24432 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,6 +96,8 @@ jobs:
           sudo ln -s /usr/bin/opt-11 /usr/bin/opt || true
           sudo apt-get install -y python3-tk
           sudo apt-get install -y libboost-all-dev
+          sudo apt-get install python3-pipx
+          sudo pipx ensurepath
 
       - name: "Setup DiscoPoP Profiler - Build"
         run: |
@@ -111,7 +113,7 @@ jobs:
       - name: C++ unit tests
         run: |
           build/test/unit_tests/DiscoPoP_UT
-  
+
   execute_end_to_end_tests:
     runs-on: ubuntu-20.04
     name: Execute end-to-end tests
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b798c087d..43efebd00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ endif()
 # install DiscoPoP python modules
 message(STATUS "Installing DiscoPoP python modules")
 execute_process(
-        COMMAND ${Python3_EXECUTABLE} -m pip install ${DiscoPoP_SOURCE_DIR}
+        COMMAND ${Python3_EXECUTABLE} -m pipx install ${DiscoPoP_SOURCE_DIR}
         RESULT_VARIABLE DP_INSTALLATION_EXIT_CODE
         OUTPUT_VARIABLE DP_INSTALLATION_OUTPUT
 )
diff --git a/rtlib/CMakeLists.txt b/rtlib/CMakeLists.txt
index e8f88b431..c1785f373 100644
--- a/rtlib/CMakeLists.txt
+++ b/rtlib/CMakeLists.txt
@@ -14,7 +14,7 @@
 set(DiscoPoP_SOURCES
         runtimeFunctions.cpp
         runtimeFunctionsGlobals.cpp
-                
+
         memory/MemoryManager.cpp
         memory/Signature.cpp
 
@@ -24,7 +24,7 @@ set(DiscoPoP_SOURCES
         calltree/DependencyMetadata.cpp
         calltree/MetaDataQueueElement.cpp
         calltree/utils.cpp
-		
+
         injected_functions/dp_add_bb_deps.cpp
         injected_functions/dp_alloca.cpp
         injected_functions/dp_call.cpp
@@ -47,7 +47,7 @@ set(DiscoPoP_SOURCES
         )
 
 set(CMAKE_CXX_FLAGS
-        "-O2 -std=c++17 -pthread -fno-rtti -fPIE -fPIC -ffreestanding")
+        "-O2 -std=c++17 -pthread -fno-rtti -fPIE -fPIC")
 
 # add_custom_target(DiscoPoP)
 
@@ -119,4 +119,4 @@ install(TARGETS DiscoPoP_RT ARCHIVE DESTINATION lib)
 # compile simple-alias-detection
 #exec_program(${CMAKE_CURRENT_SOURCE_DIR}/simple-alias-detection/compile.sh
 #    ARGS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-#)
\ No newline at end of file
+#)