diff --git a/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb b/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb
index c5354c503..02bf5b475 100644
--- a/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb	
+++ b/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb	
@@ -442,9 +442,10 @@ class TilemapRenderer
         else
           ret = true   # Need a full refresh
         end
+      else
+        ret = true
       end
       @current_map_id = $game_map.map_id
-      ret = true
     end
     # Check for tile movement
     current_map_display_x = ($game_map.display_x.to_f / Game_Map::X_SUBPIXELS).round
diff --git a/Data/Scripts/012_Overworld/006_Overworld_BerryPlants.rb b/Data/Scripts/012_Overworld/006_Overworld_BerryPlants.rb
index 7542ce707..459c8956a 100644
--- a/Data/Scripts/012_Overworld/006_Overworld_BerryPlants.rb
+++ b/Data/Scripts/012_Overworld/006_Overworld_BerryPlants.rb
@@ -443,7 +443,7 @@ def pbPickBerry(berry, qty = 1)
     return false
   end
   $stats.berry_plants_picked += 1
-  if qty >= GameData::BerryPlant.get(@berry_id).maximum_yield
+  if qty >= GameData::BerryPlant.get(berry).maximum_yield
     $stats.max_yield_berry_plants += 1
   end
   $bag.add(berry, qty)