diff --git a/Data/Scripts/001_Technical/005_PluginManager.rb b/Data/Scripts/001_Technical/005_PluginManager.rb
index 09058f34c..17b22af18 100644
--- a/Data/Scripts/001_Technical/005_PluginManager.rb
+++ b/Data/Scripts/001_Technical/005_PluginManager.rb
@@ -623,6 +623,7 @@ module PluginManager
     # fixed actions
     return false if !$DEBUG || safeExists?("Game.rgssad")
     return true if !safeExists?("Data/PluginScripts.rxdata")
+    Input.update
     return true if Input.press?(Input::CTRL)
     # analyze whether or not to push recompile
     mtime = File.mtime("Data/PluginScripts.rxdata")
diff --git a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
index d0830da7b..93f8b0a06 100644
--- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
+++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
@@ -70,9 +70,11 @@ class PokemonPokedexInfo_Scene
   def pbStartSceneBrief(species)  # For standalone access, shows first page only
     @viewport = Viewport.new(0,0,Graphics.width,Graphics.height)
     @viewport.z = 99999
-    dexnum = species
+    dexnum = 0
     dexnumshift = false
     if $Trainer.pokedex.unlocked?(-1)   # National Dex is unlocked
+      species_data = GameData::Species.try_get(species)
+      dexnum = species_data.id_number if species_data
       dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(-1)
     else
       dexnum = 0
diff --git a/Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb b/Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb
index f4ad42d0d..d33f1aa81 100644
--- a/Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb	
+++ b/Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb	
@@ -178,7 +178,7 @@ class PokemonTilesetScene
         end
       elsif Input.trigger?(Input::BACK)
         if pbConfirmMessage(_INTL("Save changes?"))
-          save_data("Data/Tilesets.rxdata", @tilesets_data)
+          save_data(@tilesets_data, "Data/Tilesets.rxdata")
           $data_tilesets = @tilesets_data
           if $game_map && $MapFactory
             $MapFactory.setup($game_map.map_id)
diff --git a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb
index a7e6bfa32..d920ac15b 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb	
@@ -683,8 +683,8 @@ end
 def pbDebugFixInvalidTiles
   num_errors = 0
   num_error_maps = 0
-  @tilesets = $data_tilesets
-  mapData = MapData.new
+  tilesets = $data_tilesets
+  mapData = Compiler::MapData.new
   t = Time.now.to_i
   Graphics.update
   for id in mapData.mapinfos.keys.sort
@@ -702,7 +702,7 @@ def pbDebugFixInvalidTiles
       for y in 0...map.data.ysize
         for i in 0...map.data.zsize
           tile_id = map.data[x, y, i]
-          next if pbCheckTileValidity(tile_id, map, @tilesets, passages)
+          next if pbCheckTileValidity(tile_id, map, tilesets, passages)
           map.data[x, y, i] = 0
           changed = true
           num_errors += 1
@@ -714,7 +714,7 @@ def pbDebugFixInvalidTiles
       event = map.events[key]
       for page in event.pages
         next if page.graphic.tile_id <= 0
-        next if pbCheckTileValidity(page.graphic.tile_id, map, @tilesets, passages)
+        next if pbCheckTileValidity(page.graphic.tile_id, map, tilesets, passages)
         page.graphic.tile_id = 0
         changed = true
         num_errors += 1