diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index 1de20cad7..ecd741849 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -197,6 +197,7 @@ light_t *t_lspr[NUMSPRITES] =
 	&lspr[NOLIGHT],     // SPR_EGGO
 	&lspr[NOLIGHT],     // SPR_SEBH
 	&lspr[NOLIGHT],     // SPR_FAKE
+	&lspr[NOLIGHT],     // SPR_SHCK
 
 	// Boss 4 (Castle Eggman)
 	&lspr[NOLIGHT],     // SPR_EGGP
diff --git a/src/p_enemy.c b/src/p_enemy.c
index dceaa6c46..f9467b2fb 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -8106,7 +8106,7 @@ void A_Boss3ShockThink(mobj_t *actor)
 		// Break the link if movements are too different
 		if (FixedHypot(snext->momx - actor->momx, snext->momy - actor->momy) > 12*actor->scale)
 		{
-			actor->hnext = NULL;
+			P_SetTarget(&actor->hnext, NULL);
 			return;
 		}
 
@@ -8125,8 +8125,8 @@ void A_Boss3ShockThink(mobj_t *actor)
 			P_SetTarget(&snew->target, actor->target);
 			snew->fuse = actor->fuse;
 
-			actor->hnext = snew;
-			snew->hnext = snext;
+			P_SetTarget(&actor->hnext, snew);
+			P_SetTarget(&snew->hnext, snext);
 		}
 	}
 }
diff --git a/src/p_mobj.c b/src/p_mobj.c
index cdc6e4be1..45eda27d1 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4627,8 +4627,8 @@ static void P_Boss3Thinker(mobj_t *mobj)
 					else
 					{
 						if (i == numtospawn - 1)
-							shock->hnext = sfirst;
-						sprev->hnext = shock;
+							P_SetTarget(&shock->hnext, sfirst);
+						P_SetTarget(&sprev->hnext, shock);
 					}
 
 					P_Thrust(shock, ang, shock->info->speed);