diff --git a/src/Ryujinx/App.axaml.cs b/src/Ryujinx/App.axaml.cs
index a42306ef5..82dd23992 100644
--- a/src/Ryujinx/App.axaml.cs
+++ b/src/Ryujinx/App.axaml.cs
@@ -5,7 +5,7 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
-using Gommon;
+using CommandLine;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
diff --git a/src/Ryujinx/Headless/Options.cs b/src/Ryujinx/Headless/Options.cs
index eb0210c7c..187c56b23 100644
--- a/src/Ryujinx/Headless/Options.cs
+++ b/src/Ryujinx/Headless/Options.cs
@@ -1,5 +1,4 @@
 using CommandLine;
-using Gommon;
 using Ryujinx.Common.Configuration;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.SystemState;
@@ -149,8 +148,10 @@ namespace Ryujinx.Headless
                 IgnoreControllerApplet = configurationState.IgnoreControllerApplet;
             
             return;
-            
-            bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
+
+            bool NeedsOverride(string argKey) =>
+                argKey != null && originalArgs.None(arg =>
+                    arg.TrimStart('-').Equals(OptionName(argKey), StringComparison.OrdinalIgnoreCase));
 
             string OptionName(string propertyName) =>
                 typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 2df1f8231..87b5c8092 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -8,7 +8,6 @@ using Avalonia.Threading;
 using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;
-using Gommon;
 using LibHac.Common;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
@@ -1571,7 +1570,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     VolumeStatusText = args.VolumeStatus;
                     FifoStatusText = args.FifoStatus;
                     ShaderCountText = args.ShaderCount > 0 ? $"Compiling shaders: {args.ShaderCount}" : string.Empty;
-                    ShowRightmostSeparator = !ShaderCountText.IsNullOrEmpty();
+                    ShowRightmostSeparator = !string.IsNullOrEmpty(ShaderCountText);
 
                     ShowStatusSeparator = true;
                 });