diff --git a/Source/Core/Controls/ActionSelectorControl.cs b/Source/Core/Controls/ActionSelectorControl.cs
index 0eaafacc..852e80a4 100644
--- a/Source/Core/Controls/ActionSelectorControl.cs
+++ b/Source/Core/Controls/ActionSelectorControl.cs
@@ -217,10 +217,11 @@ namespace CodeImp.DoomBuilder.Controls
 			{
 				list.SelectedIndex = itemindex;
 				list.Refresh();
-
-				// Raise change event
-				if(ValueChanges != null) ValueChanges(this, EventArgs.Empty);
 			}
+
+			// Raise change event
+			//mxd. This HAS to be raised during Edit form setup, otherwise TypeHandlers in ArgumentBoxes won't be initialized
+			if(ValueChanges != null) ValueChanges(this, EventArgs.Empty);
 		}
 
 		// Keys pressed in number box
diff --git a/Source/Core/ZDoom/AnimdefsParser.cs b/Source/Core/ZDoom/AnimdefsParser.cs
index 335c7fef..f1027051 100644
--- a/Source/Core/ZDoom/AnimdefsParser.cs
+++ b/Source/Core/ZDoom/AnimdefsParser.cs
@@ -56,6 +56,7 @@ namespace CodeImp.DoomBuilder.ZDoom
 				if(string.IsNullOrEmpty(token) || string.Compare(token, "CAMERATEXTURE", true) != 0) continue;
 
 				// Texture name
+				SkipWhitespace(true);
 				string texturename = StripTokenQuotes(ReadToken(false));
 				if(string.IsNullOrEmpty(texturename))
 				{