diff --git a/rehlds/HLTV/Console/src/System.cpp b/rehlds/HLTV/Console/src/System.cpp
index 9a20fee..9aa184a 100644
--- a/rehlds/HLTV/Console/src/System.cpp
+++ b/rehlds/HLTV/Console/src/System.cpp
@@ -234,7 +234,7 @@ ISystemModule *System::FindModule(char *type, char *name)
 	while (module)
 	{
 		if (Q_stricmp(type, module->GetType()) == 0
-		&& (!name || Q_stricmp(name, module->GetType()) == 0)) {
+		&& (!name || Q_stricmp(name, module->GetName()) == 0)) {
 			return module;
 		}
 
diff --git a/rehlds/HLTV/Director/CMakeLists.txt b/rehlds/HLTV/Director/CMakeLists.txt
index af56fc9..a390f0f 100644
--- a/rehlds/HLTV/Director/CMakeLists.txt
+++ b/rehlds/HLTV/Director/CMakeLists.txt
@@ -42,7 +42,7 @@ else()
 endif()
 
 if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
-	set(CMAKE_EXE_LINKER_FLAGS	"${CMAKE_EXE_LINKER_FLAGS} -Wl,--wrap=expf")
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--wrap=expf")
 endif()
 
 set(PROJECT_SRC_DIR
diff --git a/rehlds/HLTV/Proxy/CMakeLists.txt b/rehlds/HLTV/Proxy/CMakeLists.txt
index 18230dd..16f439a 100644
--- a/rehlds/HLTV/Proxy/CMakeLists.txt
+++ b/rehlds/HLTV/Proxy/CMakeLists.txt
@@ -46,7 +46,7 @@ else()
 endif()
 
 if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
-	set(CMAKE_EXE_LINKER_FLAGS	"${CMAKE_EXE_LINKER_FLAGS} -Wl,--wrap=expf")
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--wrap=expf")
 endif()
 
 set(PROJECT_SRC_DIR