diff --git a/src/k_bot.cpp b/src/k_bot.cpp
index 9989529fb..804b17e8c 100644
--- a/src/k_bot.cpp
+++ b/src/k_bot.cpp
@@ -322,7 +322,7 @@ void K_UpdateMatchRaceBots(void)
 			{
 				UINT8 index = P_RandomKey(usableskins);
 				skinnum = grabskins[index];
-				if (((cv_ingamecap.value > 0) && (usableskins >= cv_ingamecap.value)) || (usableskins >= cv_maxplayers.value))
+				if (((cv_ingamecap.value > 0) && (usableskins+1 >= cv_ingamecap.value)) || (usableskins+1 >= cv_maxplayers.value))
 				{
 					grabskins[index] = grabskins[--usableskins];
 				}
diff --git a/src/k_hud.c b/src/k_hud.c
index d7b0a11bb..9111b7549 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -1003,6 +1003,13 @@ static void K_drawKartItem(void)
 		else if (stplyr->curshield == KSHIELD_BUBBLE)
 		{
 			localpatch = kp_bubbleshield[offset];
+
+			if ((stplyr->bubbleblowup > bubbletime) && (leveltime & 1))
+			{
+				colormode = TC_BLINK;
+				localcolor = SKINCOLOR_WHITE;
+			}
+
 			itembar = 2 - stplyr->bubblepop;
 			maxl = 2;
 		}