diff --git a/bottles/backend/models/samples.py b/bottles/backend/models/samples.py
index 21b3a2d85b..73313693e2 100644
--- a/bottles/backend/models/samples.py
+++ b/bottles/backend/models/samples.py
@@ -22,7 +22,6 @@ class Samples:
                 "d3dcompiler_47",
                 "mono",
                 "gecko",
-                "faudio",
             ]
         },
         "application": {
diff --git a/bottles/frontend/cli/cli.py b/bottles/frontend/cli/cli.py
index b3f38627fa..ce27c615fe 100644
--- a/bottles/frontend/cli/cli.py
+++ b/bottles/frontend/cli/cli.py
@@ -570,8 +570,9 @@ def run_program(self):
 
             program = [p for p in programs if p["name"] == _program][0]
             _executable = program.get("path", "")
-            if _keep:
-                _args = program.get("arguments", "") + " " + _args
+            _program_args = program.get("arguments")
+            if _keep and _program_args:
+                _args = _program_args + " " + _args
             _cwd = program.get("folder", "")
             _script = program.get("script", None)
 
diff --git a/bottles/frontend/windows/launchoptions.py b/bottles/frontend/windows/launchoptions.py
index f06804dc9a..db2a9a0aa9 100644
--- a/bottles/frontend/windows/launchoptions.py
+++ b/bottles/frontend/windows/launchoptions.py
@@ -79,7 +79,8 @@ def __init__(self, parent, config, program, **kwargs):
         self.set_transient_for(self.window)
 
         # set widget defaults
-        self.entry_arguments.set_text(program.get("arguments", ""))
+        if program.get("arguments") not in ["", None]:
+            self.entry_arguments.set_text(program.get("arguments"))
 
         # keeps track of toggled switches
         self.toggled = {}