diff --git a/src/k_collide.c b/src/k_collide.c
index 4b08672d2..72badbcce 100644
--- a/src/k_collide.c
+++ b/src/k_collide.c
@@ -644,6 +644,7 @@ static INT16 K_GetBubbleDamage(mobj_t* itm)
 		}
 		/*FALLTHRU*/
 	case MT_ORBINAUT:
+	{
 		fixed_t momentum = K_Momentum3D(itm);
 
 		// Reward players on the offensive by letting fast Orbinauts shatter Bubble Shields.
@@ -654,6 +655,7 @@ static INT16 K_GetBubbleDamage(mobj_t* itm)
 		}
 
 		break;
+	}
 	default:
 		break;
 	}
diff --git a/src/k_kart.c b/src/k_kart.c
index 6b1d085f0..2d6ab0cba 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -11372,12 +11372,12 @@ boolean K_GetKartInvinType(void)
 
 boolean K_UsingLegacyCheckpoints(void)
 {
-	if (K_UsingPatchedMap() && waypointcap)
+	if (K_UsingPatchedMap() && waypointcap != NULL)
 	{
 		// we're presumably adding waypoints to an existing map
 		return false;
 	}
-	if (numbosswaypoints > 0)
+	if (numbosswaypoints > 0 || waypointcap == NULL)
 	{
 		// We are using Kart V1 waypoints!
 		return true;