diff --git a/Export_Code/gml_Object_oCharacter_Other_12.gml b/Export_Code/gml_Object_oCharacter_Other_12.gml
index c289461..ec062c0 100644
--- a/Export_Code/gml_Object_oCharacter_Other_12.gml
+++ b/Export_Code/gml_Object_oCharacter_Other_12.gml
@@ -18,7 +18,7 @@ if (invincible == 0)
             event_user(0)
         exit
     }
-    if (otherOBJ == 440 && global.playerFreeze > 0 && global.playerFreeze <= 151 && (!global.frozenByRollback))
+    if (otherOBJ == 440 && global.playerFreeze > 0 && global.playerFreeze <= 151 && (!global.frozenByRollback) && (!other.icemissiles))
         global.playerFreeze = 1
     if global.frozenByRollback
         show_debug_message("rollback freeze")
@@ -26,7 +26,7 @@ if (invincible == 0)
     {
         if (otherOBJ == 439 && other.ibeam && (!(global.currentsuit == 2 && global.item[5] == 1)) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
         {
-            global.playerFreeze = 156
+            global.playerFreeze = 120
             damageDir = 0
             knockbackY = 0
             global.frozenNormally = 1
@@ -40,7 +40,7 @@ if (invincible == 0)
         }
         if (otherOBJ == 440 && other.icemissiles && (!other.smissile) && (!(global.currentsuit == 2 && global.item[5] == 1)) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
         {
-            global.playerFreeze = 156
+            global.playerFreeze = 120
             damageDir = 0
             knockbackY = 0
             global.frozenNormally = 1
diff --git a/Export_Code/gml_Object_oClient_Other_68.gml b/Export_Code/gml_Object_oClient_Other_68.gml
index a90e4b4..6e0cafc 100644
--- a/Export_Code/gml_Object_oClient_Other_68.gml
+++ b/Export_Code/gml_Object_oClient_Other_68.gml
@@ -380,7 +380,7 @@ switch type_event
                             }
                             if checkMissile
                                 otherOBJ = 440
-                            if (checkMissile && global.playerFreeze > 0 && global.playerFreeze <= 151 && (!global.frozenNormally))
+                            if (checkMissile && (!checkFreeze) && global.playerFreeze > 0 && global.playerFreeze <= 151 && (!global.frozenNormally))
                                 global.playerFreeze = 1
                             if global.frozenNormally
                                 show_debug_message("normal freeze")
@@ -388,7 +388,7 @@ switch type_event
                             {
                                 if (checkBeam && (!(global.currentsuit == 2 && global.item[5] == 1)) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
                                 {
-                                    global.playerFreeze = 156
+                                    global.playerFreeze = 120
                                     damageDir = 0
                                     knockbackY = 0
                                     global.frozenByRollback = 1
@@ -402,7 +402,7 @@ switch type_event
                                 }
                                 if (checkMissile && (checkDamage == 10 || checkDamage == 20) && (!(global.currentsuit == 2 && global.item[5] == 1)) && global.playerFreeze == 0 && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
                                 {
-                                    global.playerFreeze = 156
+                                    global.playerFreeze = 120
                                     damageDir = 0
                                     knockbackY = 0
                                     global.frozenByRollback = 1
diff --git a/Export_Code/gml_Object_oHatchling_Step_0.gml b/Export_Code/gml_Object_oHatchling_Step_0.gml
index c8bbb22..4af3274 100644
--- a/Export_Code/gml_Object_oHatchling_Step_0.gml
+++ b/Export_Code/gml_Object_oHatchling_Step_0.gml
@@ -103,7 +103,7 @@ else if (followplayer && myid != 0)
             findHatchlingID = ds_list_find_index(global.hatchlingList, myid)
             if (findHatchlingID >= 0)
             {
-                if (ds_list_size(oClient.roomListData) > 0)
+                if (ds_list_size(oClient.roomListData) > 0 && (!global.saxmode))
                 {
                     for (h = 0; h < ds_list_size(oClient.roomListData); h++)
                     {
diff --git a/Export_Code/gml_Script_draw_gui.gml b/Export_Code/gml_Script_draw_gui.gml
index 539784f..76089c9 100644
--- a/Export_Code/gml_Script_draw_gui.gml
+++ b/Export_Code/gml_Script_draw_gui.gml
@@ -562,8 +562,11 @@ if (global.classicmode == 0 && global.opshowhud)
                     else if (abs(xDiff) <= 2 && abs(yDiff) <= 1)
                         draw_sprite_ext(sMultitroidMapIconMiepee, 0, (((276 + widescreen_space) + 16) - (xDiff * 8)), (12 - (yDiff * 8)), 1, 1, direction, c_white, oControl.malpha)
                 }
-                else if (abs(xDiff) <= 2 && abs(yDiff) <= 1 && sax == global.sax)
-                    draw_sprite_ext(oControl.MultitroidMapIcon, (arrData[0] - 1), (((276 + widescreen_space) + 16) - (xDiff * 8)), (12 - (yDiff * 8)), 1, 1, direction, c_white, oControl.malpha)
+                else if (abs(xDiff) <= 2 && abs(yDiff) <= 1)
+                {
+                    if ((!spectator) || sax)
+                        draw_sprite_ext(oControl.MultitroidMapIcon, (arrData[0] - 1), (((276 + widescreen_space) + 16) - (xDiff * 8)), (12 - (yDiff * 8)), 1, 1, direction, c_white, oControl.malpha)
+                }
             }
         }
     }