diff --git a/src/m_menu.c b/src/m_menu.c
index 5b699dcb..ea93d1e2 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -4625,7 +4625,7 @@ static void M_ReadSavegameInfo(UINT32 slot)
 		savegameinfo[slot].botskin = 0;
 
 	if (savegameinfo[slot].botskin)
-		snprintf(savegameinfo[slot].playername, 32, "%s & %s",
+		snprintf(savegameinfo[slot].playername, 36, "%s & %s",
 			skins[savegameinfo[slot].skinnum].realname,
 			skins[savegameinfo[slot].botskin-1].realname);
 	else
diff --git a/src/m_menu.h b/src/m_menu.h
index 2ff1cea9..4d6e2fac 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -190,7 +190,7 @@ typedef struct
 // savegame struct for save game menu
 typedef struct
 {
-	char playername[32];
+	char playername[37];
 	char levelname[32];
 	UINT8 actnum;
 	UINT8 skincolor;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 9de735ed..f2e54a58 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -4812,9 +4812,11 @@ void A_UnidusBall(mobj_t *actor)
 		case 0: // at least one frame where not dashing
 			if (!skull) ++actor->extravalue2;
 			else break;
+			/* FALLTHRU */
 		case 1: // at least one frame where ARE dashing
 			if (skull) ++actor->extravalue2;
 			else break;
+			/* FALLTHRU */
 		case 2: // not dashing again?
 			if (skull) break;
 			// launch.
diff --git a/src/y_inter.c b/src/y_inter.c
index cfdc2a08..e7df165b 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -57,7 +57,7 @@ typedef union
 {
 	struct
 	{
-		char passed1[14]; // KNUCKLES GOT    / CRAWLA HONCHO
+		char passed1[21]; // KNUCKLES GOT    / CRAWLA HONCHO
 		char passed2[16]; // THROUGH THE ACT / PASSED THE ACT
 		INT32 passedx1;
 		INT32 passedx2;
@@ -77,7 +77,7 @@ typedef union
 
 	struct
 	{
-		char passed1[SKINNAMESIZE+1]; // KNUCKLES GOT    / CRAWLA HONCHO
+		char passed1[29]; // KNUCKLES GOT    / CRAWLA HONCHO
 		char passed2[17];             // A CHAOS EMERALD / GOT THEM ALL!
 		char passed3[15];             //                   CAN NOW BECOME
 		char passed4[SKINNAMESIZE+7]; //                   SUPER CRAWLA HONCHO