diff --git a/Data/Scripts/007_Objects and windows/002_MessageConfig.rb b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb
index 280e3a2c9..737a2dca2 100644
--- a/Data/Scripts/007_Objects and windows/002_MessageConfig.rb	
+++ b/Data/Scripts/007_Objects and windows/002_MessageConfig.rb	
@@ -742,7 +742,7 @@ def addBackgroundOrColoredPlane(sprites,planename,background,color,viewport=nil)
   bitmapName=pbResolveBitmap("Graphics/Pictures/#{background}")
   if bitmapName==nil
     # Plane should exist in any case
-    sprites[planename]=ColoredPlane.new(color,@viewport)
+    sprites[planename]=ColoredPlane.new(color,viewport)
   else
     sprites[planename]=AnimatedPlane.new(viewport)
     sprites[planename].setBitmap(bitmapName)
diff --git a/Data/Scripts/020_Debug/002_Editor_DataTypes.rb b/Data/Scripts/020_Debug/002_Editor_DataTypes.rb
index 76197918d..44922b51f 100644
--- a/Data/Scripts/020_Debug/002_Editor_DataTypes.rb
+++ b/Data/Scripts/020_Debug/002_Editor_DataTypes.rb
@@ -1004,7 +1004,7 @@ module MovePoolProperty
               end
             when 1   # Change move
               newmove = pbChooseMoveList(entry[1])
-              if newmove
+              if newmove && newmove != entry[1]
                 havemove = -1
                 realcmds.each do |e|
                   havemove = e[2] if e[0] == entry[0] && e[1] == newmove
@@ -1012,6 +1012,7 @@ module MovePoolProperty
                 if havemove >= 0   # New move already known at level; delete this move
                   realcmds[cmd[1]] = nil
                   realcmds.compact!
+                  cmd[1] = [cmd[1], realcmds.length - 1].min
                   oldsel = havemove
                 else   # Apply the new move
                   entry[1] = newmove