diff --git a/OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs b/OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs
index fc65e40e0a..ef4664b537 100644
--- a/OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs
+++ b/OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs
@@ -136,8 +136,8 @@ namespace OpenRA.Mods.Common.Traits
 
 		public event Action<Color> OnColorPickerColorUpdate;
 
-		(float sMin, float sMax) IColorPickerManagerInfo.SaturationRange => (HsvSaturationRange[0], HsvSaturationRange[1]);
-		(float vMin, float vMax) IColorPickerManagerInfo.ValueRange => (HsvValueRange[0], HsvValueRange[1]);
+		(float SMin, float SMax) IColorPickerManagerInfo.SaturationRange => (HsvSaturationRange[0], HsvSaturationRange[1]);
+		(float VMin, float VMax) IColorPickerManagerInfo.ValueRange => (HsvValueRange[0], HsvValueRange[1]);
 
 		Color[] IColorPickerManagerInfo.PresetColors => PresetColors;
 
diff --git a/OpenRA.Mods.Common/TraitsInterfaces.cs b/OpenRA.Mods.Common/TraitsInterfaces.cs
index bca48f2bf0..8181ed1ecb 100644
--- a/OpenRA.Mods.Common/TraitsInterfaces.cs
+++ b/OpenRA.Mods.Common/TraitsInterfaces.cs
@@ -294,8 +294,8 @@ namespace OpenRA.Mods.Common.Traits
 
 	public interface IColorPickerManagerInfo : ITraitInfoInterface
 	{
-		(float sMin, float sMax) SaturationRange { get; }
-		(float vMin, float vMax) ValueRange { get; }
+		(float SMin, float SMax) SaturationRange { get; }
+		(float VMin, float VMax) ValueRange { get; }
 		event Action<Color> OnColorPickerColorUpdate;
 		Color[] PresetColors { get; }
 		Color RandomPresetColor(MersenneTwister random, IEnumerable<Color> terrainColors, IEnumerable<Color> playerColors);
diff --git a/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs b/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
index 4f2bf04e3f..a9d3366698 100644
--- a/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
@@ -61,9 +61,7 @@ namespace OpenRA.Mods.Common.Widgets
 			minVal = minValue;
 			maxVal = maxValue;
 
-			if (newHue == null)
-				newHue = H;
-
+			newHue ??= H;
 			var buffer = new byte[4 * 256 * 256];
 			unsafe
 			{