diff --git a/source_modules/hydrasdr_source/CMakeLists.txt b/source_modules/hydrasdr_source/CMakeLists.txt
index fa6630f0..6f4406c9 100644
--- a/source_modules/hydrasdr_source/CMakeLists.txt
+++ b/source_modules/hydrasdr_source/CMakeLists.txt
@@ -6,9 +6,9 @@ file(GLOB SRC "src/*.cpp")
 include(${SDRPP_MODULE_CMAKE})
 
 if (MSVC)
-    target_link_directories(hydrasdr_source PRIVATE "C:/Program Files/hydrasdr_all/bin/")
+    target_link_directories(hydrasdr_source PRIVATE "C:/Program Files (x86)/hydrasdr_all/bin/")
 
-    target_include_directories(hydrasdr_source PUBLIC "C:/Program Files/hydrasdr_all/include/libhydrasdr")
+    target_include_directories(hydrasdr_source PUBLIC "C:/Program Files (x86)/hydrasdr_all/include/libhydrasdr")
 
     target_link_libraries(hydrasdr_source PRIVATE hydrasdr)
 elseif (ANDROID)
diff --git a/source_modules/hydrasdr_source/src/main.cpp b/source_modules/hydrasdr_source/src/main.cpp
index ee14b65c..6c0eb061 100644
--- a/source_modules/hydrasdr_source/src/main.cpp
+++ b/source_modules/hydrasdr_source/src/main.cpp
@@ -100,9 +100,7 @@ public:
 
         // Get device info
         std::string fakeName = "HydraSDR USB";
-        devList.push_back(0xDEADBEEF);
-        devListTxt += fakeName;
-        devListTxt += '\0';
+        devices.define(fakeName, 0);
 #endif
     }