diff --git a/src/sdr/SDRDeviceInfo.cpp b/src/sdr/SDRDeviceInfo.cpp
index 255a5646..b2320515 100644
--- a/src/sdr/SDRDeviceInfo.cpp
+++ b/src/sdr/SDRDeviceInfo.cpp
@@ -99,11 +99,11 @@ void SDRDeviceChannel::setHardwareDC(const bool& hardware) {
 
 
 const bool& SDRDeviceChannel::hasCORR() const {
-    return hardwareDC;
+    return hasCorr;
 }
 
-void SDRDeviceChannel::setCORR(const bool& hardware) {
-    hardwareDC = hardware;
+void SDRDeviceChannel::setCORR(const bool& hasCorr) {
+	this->hasCorr = hasCorr;
 }
 
 
diff --git a/src/sdr/SDREnumerator.cpp b/src/sdr/SDREnumerator.cpp
index 40db8691..9c369dbe 100644
--- a/src/sdr/SDREnumerator.cpp
+++ b/src/sdr/SDREnumerator.cpp
@@ -143,9 +143,9 @@ std::vector<SDRDeviceInfo *> *SDREnumerator::enumerate_devices(std::string remot
             std::cout << "  " << it->first << " = " << it->second << std::endl;
             if (it->first == "driver") {
                 dev->setDriver(it->second);
-            } else if (it->first == "label") {
+            } else if (it->first == "label" || it->first == "device") {
                 dev->setName(it->second);
-            }
+			}
         }
 
         dev->setDeviceArgs(deviceArgs);