diff --git a/src/BizHawk.Client.Common/movie/import/DsmImport.cs b/src/BizHawk.Client.Common/movie/import/DsmImport.cs
index 9d0813c7d1..49ee639863 100644
--- a/src/BizHawk.Client.Common/movie/import/DsmImport.cs
+++ b/src/BizHawk.Client.Common/movie/import/DsmImport.cs
@@ -13,7 +13,10 @@ namespace BizHawk.Client.Common
 	{
 		private static readonly ControllerDefinition DeSmuMEControllerDef = new ControllerDefinition("NDS Controller")
 		{
-			BoolButtons = { "Up", "Down", "Left", "Right", "Start", "Select", "B", "A", "Y", "X", "L", "R", "LidOpen", "LidClose", "Touch", "Power" },
+			BoolButtons =
+			{
+				"Up", "Down", "Left", "Right", "Start", "Select", "B", "A", "Y", "X", "L", "R", "LidOpen", "LidClose", "Touch", "Power"
+			}
 		}.AddXYPair("Touch {0}", AxisPairOrientation.RightAndUp, 0.RangeTo(255), 128, 0.RangeTo(191), 96) //TODO verify direction against hardware
 			.AddAxis("Mic Volume", 0.RangeTo(100), 0)
 			.AddAxis("GBA Light Sensor", 0.RangeTo(10), 0)
diff --git a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisDict.cs b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisDict.cs
index 325bebe51b..0973c5852a 100644
--- a/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisDict.cs	
+++ b/src/BizHawk.Emulation.Common/Base Implementations/Axes/AxisDict.cs	
@@ -59,7 +59,13 @@ namespace BizHawk.Emulation.Common
 
 		public bool ContainsKey(string key) => _keys.Contains(key);
 
-		public IEnumerator<KeyValuePair<string, AxisSpec>> GetEnumerator() => _specs.GetEnumerator();
+		public IEnumerator<KeyValuePair<string, AxisSpec>> GetEnumerator()
+		{
+			foreach (var key in _keys)
+			{
+				yield return new(key, _specs[key]);
+			}
+		}
 
 		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();