diff --git a/Applications/Utils/OGSFileConverter/CMakeLists.txt b/Applications/Utils/OGSFileConverter/CMakeLists.txt
index 15ec84709ea3e051c2cfa803cdf1fba774f4a568..38bd1d1e12865fffd4a8345d9ee241f1d6125c5a 100644
--- a/Applications/Utils/OGSFileConverter/CMakeLists.txt
+++ b/Applications/Utils/OGSFileConverter/CMakeLists.txt
@@ -1,37 +1,31 @@
-set(SOURCES
+add_library(OGSFileConverterLib
+    FileListDialog.h
+    OGSFileConverter.h
     FileListDialog.cpp
     OGSFileConverter.cpp
 )
-
-include_directories(
-    # Qt generated file includes
-    ${CMAKE_CURRENT_BINARY_DIR}
-
-    # Workaround for CMake 3.8
-    ${CMAKE_CURRENT_BINARY_DIR}/OGSFileConverterLib_autogen/include
+target_link_libraries(OGSFileConverterLib
+    PUBLIC ApplicationsFileIO MathLib QtBase ${VTK_LIBRARIES}
+    INTERFACE MeshLib
 )
 
-add_library(OGSFileConverterLib
-    ${SOURCES}
-    ${HEADERS}
-)
-target_link_libraries(OGSFileConverterLib
-    PUBLIC QtBase MathLib
-    INTERFACE MeshLib ApplicationsFileIO
+target_include_directories(OGSFileConverterLib PUBLIC
+    ${CMAKE_CURRENT_BINARY_DIR}/OGSFileConverterLib_autogen/include)
+
+set_target_properties(OGSFileConverterLib PROPERTIES
+    AUTOMOC TRUE
+    AUTOUIC TRUE
 )
 
 add_executable(OGSFileConverter main.cpp)
 
 target_link_libraries(OGSFileConverter
-    OGSFileConverterLib
-    ApplicationsFileIO
+    PUBLIC OGSFileConverterLib ApplicationsFileIO
 )
 
 set_target_properties(OGSFileConverter OGSFileConverterLib
     PROPERTIES
     FOLDER "Utilities"
-    AUTOMOC ON
-    AUTOUIC ON
 )
 
 if(OGS_USE_PCH)
@@ -41,7 +35,5 @@ endif()
 ####################
 ### Installation ###
 ####################
-
 install(TARGETS OGSFileConverter RUNTIME DESTINATION bin COMPONENT ogs_cli)
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "OGSFileConverter" "File Converter")
-set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/OGSFileConverter.exe" "File Converter" PARENT_SCOPE)
diff --git a/ProcessLib/SourceTerms/Python/CMakeLists.txt b/ProcessLib/SourceTerms/Python/CMakeLists.txt
index 8ecddaea2e59a5715ef26188d8e27f4795415512..2fe58ad12a40af27a83d8bde04fe0f2d2cbb775f 100644
--- a/ProcessLib/SourceTerms/Python/CMakeLists.txt
+++ b/ProcessLib/SourceTerms/Python/CMakeLists.txt
@@ -14,7 +14,7 @@ target_compile_definitions(ProcessLibSourceTermPython
     PUBLIC OGS_USE_PYTHON)
 
 target_link_libraries(ProcessLibSourceTermPython
-    PUBLIC BaseLib MathLib MeshLib NumLib logog
+    PUBLIC BaseLib MathLib MeshLib NumLib logog ${Python_LIBRARIES}
     PRIVATE pybind11::pybind11)
 
 # For the embedded Python module
diff --git a/scripts/cmake/MetisSetup.cmake b/scripts/cmake/MetisSetup.cmake
index 0f07f424c12911f025fe9e72aef035e97c734a83..5ed1234541a482f91f9f3c55dc871c053666826a 100644
--- a/scripts/cmake/MetisSetup.cmake
+++ b/scripts/cmake/MetisSetup.cmake
@@ -23,6 +23,9 @@ include_directories(BEFORE ${METIS_PATH}/libmetis)
 file(GLOB metis_sources ${METIS_PATH}/libmetis/*.c)
 # Build libmetis.
 add_library(metis ${GKlib_sources} ${metis_sources})
+if(OPENMP_FOUND)
+    target_link_libraries(metis OpenMP::OpenMP_C)
+endif()
 if(BUILD_SHARED_LIBS)
     install(TARGETS metis LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()