diff --git a/src/k_kart.c b/src/k_kart.c
index 813c0f441..60a3ea2e8 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -5625,7 +5625,7 @@ void K_PuntMine(mobj_t *origMine, mobj_t *punter)
 
 	spd = FixedMul(82 * punter->scale, K_GetKartGameSpeedScalar(gamespeed)); // Avg Speed is 41 in Normal
 
-	mine->flags |= MF_NOCLIPTHING;
+	mine->flags |= (MF_NOCLIP|MF_NOCLIPTHING);
 
 	P_SetMobjState(mine, S_SSMINE_AIR1);
 	mine->threshold = 10;
@@ -5637,7 +5637,7 @@ void K_PuntMine(mobj_t *origMine, mobj_t *punter)
 
 	//K_SetHitLagForObjects(punter, mine, 5);
 
-	mine->flags &= ~MF_NOCLIPTHING;
+	mine->flags &= ~(MF_NOCLIP|MF_NOCLIPTHING);
 }
 
 #define THUNDERRADIUS 320
@@ -6150,11 +6150,11 @@ void K_DropHnextList(player_t *player, boolean keepshields)
 			{
 				fixed_t radius = FixedMul(work->info->radius, dropwork->destscale);
 				radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(radius, radius); // mobj's distance from its Target, or Radius.
-				dropwork->flags |= MF_NOCLIPTHING;
+				dropwork->flags |= (MF_NOCLIP|MF_NOCLIPTHING);
 				work->momx = FixedMul(FINECOSINE(work->angle>>ANGLETOFINESHIFT), radius);
 				work->momy = FixedMul(FINESINE(work->angle>>ANGLETOFINESHIFT), radius);
 				P_MoveOrigin(dropwork, player->mo->x + work->momx, player->mo->y + work->momy, player->mo->z);
-				dropwork->flags &= ~MF_NOCLIPTHING;
+				dropwork->flags &= ~(MF_NOCLIP|MF_NOCLIPTHING);
 			}
 
 			dropwork->flags2 |= MF2_AMBUSH;
diff --git a/src/objects/orbinaut.c b/src/objects/orbinaut.c
index 27e3fe742..6f9ba3788 100644
--- a/src/objects/orbinaut.c
+++ b/src/objects/orbinaut.c
@@ -335,23 +335,24 @@ void Obj_OrbinautJawzMoveHeld(player_t *player)
 {
 	fixed_t finalscale = K_ItemScaleForPlayer(player);
 	fixed_t speed = 0;
-	mobj_t *cur = NULL;
+	mobj_t *cur = NULL, *next = player->mo->hnext;
 
 	player->bananadrag = 0; // Just to make sure
 
-	cur = player->mo->hnext;
-	speed = ((8 - min(4, player->itemamount)) * cur->info->speed) / 7;
+	if (next == NULL)
+		return;
 
-	while (cur != NULL && P_MobjWasRemoved(cur) == false)
+	speed = ((8 - min(4, player->itemamount)) * next->info->speed) / 7;
+
+	while ((cur = next) != NULL && P_MobjWasRemoved(cur) == false)
 	{
 		const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); // mobj's distance from its Target, or Radius.
 		fixed_t z;
 
+		next = cur->hnext;
+
 		if (!cur->health)
-		{
-			cur = cur->hnext;
 			continue;
-		}
 
 		cur->color = player->skincolor;
 
@@ -391,15 +392,17 @@ void Obj_OrbinautJawzMoveHeld(player_t *player)
 			z = player->mo->z + player->mo->height - cur->height;
 		}
 
-		cur->flags |= MF_NOCLIPTHING; // temporarily make them noclip other objects so they can't hit anyone while in the player
+		cur->flags |= (MF_NOCLIP|MF_NOCLIPTHING); // temporarily make them noclip other objects so they can't hit anyone while in the player
 		P_MoveOrigin(cur, player->mo->x, player->mo->y, z);
 		cur->momx = FixedMul(FINECOSINE(cur->angle >> ANGLETOFINESHIFT), orbinaut_shield_dist(cur));
 		cur->momy = FixedMul(FINESINE(cur->angle >> ANGLETOFINESHIFT), orbinaut_shield_dist(cur));
-		cur->flags &= ~MF_NOCLIPTHING;
+		cur->flags &= ~(MF_NOCLIP|MF_NOCLIPTHING);
 
 		if (!P_TryMove(cur, player->mo->x + cur->momx, player->mo->y + cur->momy, true, NULL))
 		{
 			P_SlideMove(cur, NULL);
+			if (P_MobjWasRemoved(cur))
+				continue;
 		}
 
 		if (P_IsObjectOnGround(player->mo))
@@ -426,8 +429,6 @@ void Obj_OrbinautJawzMoveHeld(player_t *player)
 		cur->z = z;
 		cur->momx = cur->momy = 0;
 		cur->angle += ANGLE_90;
-
-		cur = cur->hnext;
 	}
 }