diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt
index 64415557..e411f7b1 100644
--- a/airspyhf_source/CMakeLists.txt
+++ b/airspyhf_source/CMakeLists.txt
@@ -23,9 +23,9 @@ if (MSVC)
 else (MSVC)
     find_package(PkgConfig)
 
-    pkg_check_modules(SOAPY REQUIRED libairspyhf)
+    pkg_check_modules(LIBAIRSPYHF REQUIRED libairspyhf)
 
     target_include_directories(airspyhf_source PUBLIC ${LIBAIRSPYHF_INCLUDE_DIRS})
-    target_link_directories(airspyhf_source PUBLIC ${AIRSPYHF_LIBRARY_DIRS})
+    target_link_directories(airspyhf_source PUBLIC ${LIBAIRSPYHF_LIBRARY_DIRS})
     target_link_libraries(airspyhf_source PUBLIC ${LIBAIRSPYHF_LIBRARIES})
 endif (MSVC)
\ No newline at end of file
diff --git a/airspyhf_source/src/main.cpp b/airspyhf_source/src/main.cpp
index ce85fdf4..b5144275 100644
--- a/airspyhf_source/src/main.cpp
+++ b/airspyhf_source/src/main.cpp
@@ -40,6 +40,8 @@ public:
 
         refresh();
 
+        selectFirst();
+
         // config.aquire();
         // std::string serString = config.conf["device"];
         // config.release();
diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt
index 260ede75..00c9cfcb 100644
--- a/plutosdr_source/CMakeLists.txt
+++ b/plutosdr_source/CMakeLists.txt
@@ -25,8 +25,8 @@ if (MSVC)
 else (MSVC)
     find_package(PkgConfig)
 
-    pkg_check_modules(SOAPY REQUIRED libiio)
-    pkg_check_modules(SOAPY REQUIRED libad9361)
+    pkg_check_modules(LIBIIO REQUIRED libiio)
+    pkg_check_modules(LIBAD9361 REQUIRED libad9361)
 
     target_include_directories(plutosdr_source PUBLIC ${LIBIIO_INCLUDE_DIRS})
     target_link_directories(plutosdr_source PUBLIC ${LIBIIO_LIBRARY_DIRS})