diff --git a/LttPClient.py b/LttPClient.py
index 4c0f1f65..13674cbd 100644
--- a/LttPClient.py
+++ b/LttPClient.py
@@ -852,10 +852,11 @@ async def game_watcher(ctx: Context):
 
         if recv_index < len(ctx.items_received) and recv_item == 0:
             item = ctx.items_received[recv_index]
+            recv_index += 1
             logging.info('Received %s from %s (%s) (%d/%d in list)' % (
                 color(ctx.item_name_getter(item.item), 'red', 'bold'), color(ctx.player_names[item.player], 'yellow'),
-                ctx.location_name_getter(item.location), recv_index + 1, len(ctx.items_received)))
-            recv_index += 1
+                ctx.location_name_getter(item.location), recv_index, len(ctx.items_received)))
+
             snes_buffered_write(ctx, RECV_PROGRESS_ADDR, bytes([recv_index & 0xFF, (recv_index >> 8) & 0xFF]))
             snes_buffered_write(ctx, RECV_ITEM_ADDR, bytes([item.item]))
             snes_buffered_write(ctx, RECV_ITEM_PLAYER_ADDR, bytes([item.player if item.player != ctx.slot else 0]))
diff --git a/data/factorio/mod_template/data-final-fixes.lua b/data/factorio/mod_template/data-final-fixes.lua
index 9efd1539..137a03bb 100644
--- a/data/factorio/mod_template/data-final-fixes.lua
+++ b/data/factorio/mod_template/data-final-fixes.lua
@@ -69,7 +69,7 @@ prep_copy(new_tree_copy, original_tech)
 {% if tech_cost_scale != 1 %}
 new_tree_copy.unit.count = math.max(1, math.floor(new_tree_copy.unit.count * {{ tech_cost_scale }}))
 {% endif %}
-{%- if item_name in tech_table and tech_tree_information == 2 -%}
+{%- if item_name in tech_table and tech_tree_information == 2 or original_tech_name in static_nodes -%}
 {#- copy Factorio Technology Icon -#}
 copy_factorio_icon(new_tree_copy, "{{ item_name }}")
 {%- else -%}
diff --git a/data/factorio/mod_template/locale/en/locale.cfg b/data/factorio/mod_template/locale/en/locale.cfg
index b9924ad6..f3a0d044 100644
--- a/data/factorio/mod_template/locale/en/locale.cfg
+++ b/data/factorio/mod_template/locale/en/locale.cfg
@@ -1,7 +1,7 @@
 
 [technology-name]
 {% for original_tech_name, item_name, receiving_player, advancement in locations %}
-{%- if tech_tree_information == 2 -%}
+{%- if tech_tree_information == 2 or original_tech_name in static_nodes  -%}
 ap-{{ tech_table[original_tech_name] }}-={{ player_names[receiving_player] }}'s {{ item_name }}
 {% else %}
 ap-{{ tech_table[original_tech_name] }}-=An Archipelago Sendable
@@ -10,10 +10,10 @@ ap-{{ tech_table[original_tech_name] }}-=An Archipelago Sendable
 
 [technology-description]
 {% for original_tech_name, item_name, receiving_player, advancement in locations %}
-{%- if tech_tree_information == 2 %}
-ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends {{ item_name }} to {{ player_names[receiving_player] }}{% if advancement %}, which is considered a logical advancement{% endif %}.
+{%- if tech_tree_information == 2 or original_tech_name in static_nodes %}
+ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends {{ item_name }} to {{ player_names[receiving_player] }}{% if advancement %}, which is considered a logical advancement{% endif %}. For purposes of hints, this location is called "{{ original_tech_name }}".
 {%- elif tech_tree_information == 1 and advancement %}
-ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends something to someone, which is considered a logical advancement.
+ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends something to someone, which is considered a logical advancement. For purposes of hints, this location is called "{{ original_tech_name }}".
 {%- else %}
 ap-{{ tech_table[original_tech_name] }}-=Researching this technology sends something to someone.
 {%- endif -%}
diff --git a/worlds/factorio/Mod.py b/worlds/factorio/Mod.py
index ef31663d..c68f7102 100644
--- a/worlds/factorio/Mod.py
+++ b/worlds/factorio/Mod.py
@@ -75,7 +75,7 @@ def generate_mod(world: MultiWorld, player: int):
                      "rocket_recipe": rocket_recipes[world.max_science_pack[player].value],
                      "slot_name": world.player_names[player][0], "seed_name": world.seed_name,
                      "starting_items": world.starting_items[player], "recipes": recipes,
-                     "random": world.slot_seeds[player],
+                     "random": world.slot_seeds[player], "static_nodes": world.worlds[player].static_nodes,
                      "recipe_time_scale": recipe_time_scales[world.recipe_time[player].value]}
 
     for factorio_option in Options.factorio_options: