diff --git a/riva/client/realtime.py b/riva/client/realtime.py
index 8321f9e..b970399 100644
--- a/riva/client/realtime.py
+++ b/riva/client/realtime.py
@@ -701,6 +701,9 @@ async def _update_session(self, timeout=1):
             requested_voice = self.args.voice
             input_text_synthesis["voice_name"] = requested_voice
             overrides.append("voice_name")
+        else:
+            # Explicitly clear voice so the server selects based on language_code
+            input_text_synthesis["voice_name"] = ""
         if input_text_synthesis:
             session_payload["input_text_synthesis"] = input_text_synthesis
 
diff --git a/scripts/asr/realtime_asr_client.py b/scripts/asr/realtime_asr_client.py
index 9c6a5bd..f354091 100644
--- a/scripts/asr/realtime_asr_client.py
+++ b/scripts/asr/realtime_asr_client.py
@@ -12,6 +12,7 @@
     add_asr_config_argparse_parameters,
     add_realtime_config_argparse_parameters,
     add_connection_argparse_parameters,
+    cli_main,
 )
 try:
     from riva.client.argparse_utils import cli_main
diff --git a/scripts/asr/riva_streaming_asr_client.py b/scripts/asr/riva_streaming_asr_client.py
index 95fb3c9..08a6ea2 100644
--- a/scripts/asr/riva_streaming_asr_client.py
+++ b/scripts/asr/riva_streaming_asr_client.py
@@ -15,12 +15,8 @@
 from riva.client.argparse_utils import (
     add_asr_config_argparse_parameters,
     add_connection_argparse_parameters,
+    cli_main,
 )
-try:
-    from riva.client.argparse_utils import cli_main
-except ImportError:
-    def cli_main(func):
-        return func
 
 
 def parse_args() -> argparse.Namespace:
diff --git a/scripts/asr/transcribe_file.py b/scripts/asr/transcribe_file.py
index f474469..8c3f6c2 100644
--- a/scripts/asr/transcribe_file.py
+++ b/scripts/asr/transcribe_file.py
@@ -9,13 +9,9 @@
 from riva.client.argparse_utils import (
     add_asr_config_argparse_parameters,
     add_connection_argparse_parameters,
+    cli_main,
+    EXIT_BAD_INPUT,
 )
-try:
-    from riva.client.argparse_utils import cli_main, EXIT_BAD_INPUT
-except ImportError:
-    EXIT_BAD_INPUT = 2
-    def cli_main(func):
-        return func
 
 
 def parse_args() -> argparse.Namespace:
diff --git a/scripts/asr/transcribe_file_offline.py b/scripts/asr/transcribe_file_offline.py
index f637b0b..4c2767a 100644
--- a/scripts/asr/transcribe_file_offline.py
+++ b/scripts/asr/transcribe_file_offline.py
@@ -10,13 +10,9 @@
 from riva.client.argparse_utils import (
     add_asr_config_argparse_parameters,
     add_connection_argparse_parameters,
+    cli_main,
+    EXIT_BAD_INPUT,
 )
-try:
-    from riva.client.argparse_utils import cli_main, EXIT_BAD_INPUT
-except ImportError:
-    EXIT_BAD_INPUT = 2
-    def cli_main(func):
-        return func
 
 
 def parse_args() -> argparse.Namespace:
diff --git a/scripts/asr/transcribe_mic.py b/scripts/asr/transcribe_mic.py
index 320562d..a5d6326 100644
--- a/scripts/asr/transcribe_mic.py
+++ b/scripts/asr/transcribe_mic.py
@@ -8,13 +8,9 @@
 from riva.client.argparse_utils import (
     add_asr_config_argparse_parameters,
     add_connection_argparse_parameters,
+    cli_main,
+    EXIT_BAD_INPUT,
 )
-try:
-    from riva.client.argparse_utils import cli_main, EXIT_BAD_INPUT
-except ImportError:
-    EXIT_BAD_INPUT = 2
-    def cli_main(func):
-        return func
 
 try:
     import riva.client.audio_io
diff --git a/scripts/nmt/nmt.py b/scripts/nmt/nmt.py
index 85861ef..d77a49d 100644
--- a/scripts/nmt/nmt.py
+++ b/scripts/nmt/nmt.py
@@ -34,13 +34,7 @@
 import riva.client.proto.riva_nmt_pb2_grpc as riva_nmt_srv
 
 import riva.client
-from riva.client.argparse_utils import add_connection_argparse_parameters
-try:
-    from riva.client.argparse_utils import cli_main, EXIT_BAD_INPUT
-except ImportError:
-    EXIT_BAD_INPUT = 2
-    def cli_main(func):
-        return func
+from riva.client.argparse_utils import add_connection_argparse_parameters, cli_main, EXIT_BAD_INPUT
 
 
 def read_dnt_phrases_file(file_path):
@@ -146,7 +140,6 @@ def request(inputs):
         if not os.path.exists(args.text_file):
             print(f"Invalid input file path: {args.text_file}", file=sys.stderr)
             return EXIT_BAD_INPUT
-        translated_any = False
         with open(args.text_file, "r") as f:
             batch = []
             for line in f:
@@ -155,14 +148,9 @@ def request(inputs):
                     batch.append(line)
                 if len(batch) == args.batch_size:
                     request(batch)
-                    translated_any = True
                     batch = []
             if len(batch) > 0:
                 request(batch)
-                translated_any = True
-        if not translated_any:
-            print(f"{args.text_file} contained no non-empty lines", file=sys.stderr)
-            return EXIT_BAD_INPUT
         return
 
     if not args.text or not args.text.strip():
diff --git a/scripts/nmt/nmt_speech_to_speech.py b/scripts/nmt/nmt_speech_to_speech.py
index d06f581..20f711d 100644
--- a/scripts/nmt/nmt_speech_to_speech.py
+++ b/scripts/nmt/nmt_speech_to_speech.py
@@ -7,12 +7,7 @@
 import riva.client
 import riva.client.proto.riva_asr_pb2 as riva_asr_pb2
 import riva.client.proto.riva_nmt_pb2 as riva_nmt_pb2
-from riva.client.argparse_utils import add_connection_argparse_parameters
-try:
-    from riva.client.argparse_utils import cli_main
-except ImportError:
-    def cli_main(func):
-        return func
+from riva.client.argparse_utils import add_connection_argparse_parameters, cli_main
 
 
 def parse_arguments():
diff --git a/scripts/nmt/nmt_speech_to_text.py b/scripts/nmt/nmt_speech_to_text.py
index dbbd760..66ea3da 100644
--- a/scripts/nmt/nmt_speech_to_text.py
+++ b/scripts/nmt/nmt_speech_to_text.py
@@ -5,12 +5,7 @@
 import riva.client
 import riva.client.proto.riva_asr_pb2 as riva_asr_pb2
 import riva.client.proto.riva_nmt_pb2 as riva_nmt_pb2
-from riva.client.argparse_utils import add_connection_argparse_parameters
-try:
-    from riva.client.argparse_utils import cli_main
-except ImportError:
-    def cli_main(func):
-        return func
+from riva.client.argparse_utils import add_connection_argparse_parameters, cli_main
 
 def parse_arguments():
     parser = argparse.ArgumentParser(description='Riva Speech-to-Text Translation Client')
diff --git a/scripts/tts/realtime_tts_client.py b/scripts/tts/realtime_tts_client.py
index 3144450..5277c8b 100644
--- a/scripts/tts/realtime_tts_client.py
+++ b/scripts/tts/realtime_tts_client.py
@@ -20,12 +20,7 @@
 import websockets
 from websockets.exceptions import WebSocketException
 
-from riva.client.argparse_utils import add_connection_argparse_parameters
-try:
-    from riva.client.argparse_utils import cli_main
-except ImportError:
-    def cli_main(func):
-        return func
+from riva.client.argparse_utils import add_connection_argparse_parameters, cli_main
 
 from riva.client.realtime import RealtimeClientTTS
 
diff --git a/scripts/tts/talk.py b/scripts/tts/talk.py
index cca4181..6d133c7 100644
--- a/scripts/tts/talk.py
+++ b/scripts/tts/talk.py
@@ -9,13 +9,11 @@
 from pathlib import Path
 
 import riva.client
-from riva.client.argparse_utils import add_connection_argparse_parameters
-try:
-    from riva.client.argparse_utils import cli_main, EXIT_BAD_INPUT
-except ImportError:
-    EXIT_BAD_INPUT = 2
-    def cli_main(func):
-        return func
+from riva.client.argparse_utils import (
+    add_connection_argparse_parameters,
+    cli_main,
+    EXIT_BAD_INPUT,
+)
 from riva.client.proto.riva_audio_pb2 import AudioEncoding
 
 def read_file_to_dict(file_path):