diff --git a/src/ria_toolkit_oss_cli/ria_toolkit_oss/capture.py b/src/ria_toolkit_oss_cli/ria_toolkit_oss/capture.py
index ed9f338..00ad5db 100644
--- a/src/ria_toolkit_oss_cli/ria_toolkit_oss/capture.py
+++ b/src/ria_toolkit_oss_cli/ria_toolkit_oss/capture.py
@@ -337,6 +337,8 @@ def capture(
     if duration is not None and num_samples is None:
         num_samples = int(duration * sample_rate)
         echo_verbose(f"Duration {duration}s = {num_samples} samples at {format_sample_rate(sample_rate)}", verbose)
+    elif duration is None and num_samples is None:
+        raise click.ClickException(f"Must provide either --num-samples or --duration")
 
     # Show capture parameters
     echo_progress(f"Capturing from {device.upper()}...", quiet)
diff --git a/src/ria_toolkit_oss_cli/ria_toolkit_oss/common.py b/src/ria_toolkit_oss_cli/ria_toolkit_oss/common.py
index 05a06ce..7cdcd73 100644
--- a/src/ria_toolkit_oss_cli/ria_toolkit_oss/common.py
+++ b/src/ria_toolkit_oss_cli/ria_toolkit_oss/common.py
@@ -357,7 +357,7 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False):
 
     try:
         if device_type == "pluto":
-            from src.ria_toolkit_oss.sdr.pluto import Pluto
+            from ria_toolkit_oss.sdr.pluto import Pluto
 
             if ip_addr:
                 return Pluto(identifier=ip_addr)
@@ -365,17 +365,17 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False):
                 return Pluto()
 
         elif device_type == "hackrf":
-            from src.ria_toolkit_oss.sdr.hackrf import HackRF
+            from ria_toolkit_oss.sdr.hackrf import HackRF
 
             return HackRF()
 
         elif device_type == "bladerf":
-            from src.ria_toolkit_oss.sdr.blade import Blade
+            from ria_toolkit_oss.sdr.blade import Blade
 
             return Blade()
 
         elif device_type == "usrp":
-            from src.ria_toolkit_oss.sdr.usrp import USRP
+            from ria_toolkit_oss.sdr.usrp import USRP
 
             if ip_addr:
                 return USRP(identifier=f"addr={ip_addr}")
@@ -385,12 +385,12 @@ def get_sdr_device(device_type: str, ident: Optional[str] = None, tx=False):
                 return USRP()
 
         elif device_type == "rtlsdr":
-            from src.ria_toolkit_oss.sdr.rtlsdr import RTLSDR
+            from ria_toolkit_oss.sdr.rtlsdr import RTLSDR
 
             return RTLSDR()
 
         elif device_type == "thinkrf":
-            from src.ria_toolkit_oss.sdr.thinkrf import ThinkRF
+            from ria_toolkit_oss.sdr.thinkrf import ThinkRF
 
             if ip_addr:
                 return ThinkRF(identifier=ip_addr)