diff --git a/src/k_botitem.cpp b/src/k_botitem.cpp
index 70cd7eb29..aa438497d 100644
--- a/src/k_botitem.cpp
+++ b/src/k_botitem.cpp
@@ -47,7 +47,7 @@
 --------------------------------------------------*/
 static inline boolean K_ItemButtonWasDown(const player_t *player)
 {
-	return (player->oldcmd.buttons & BT_ATTACK);
+	return !!(player->oldcmd.buttons & BT_ATTACK);
 }
 
 /*--------------------------------------------------
@@ -1234,6 +1234,9 @@ static void K_BotItemBubble(const player_t *player, ticcmd_t *cmd)
 
 	boolean hold = false;
 
+	if (player->botvars.itemconfirm > 10*TICRATE)
+		hold = true;
+
 	if (player->bubbleblowup <= 0)
 	{
 		UINT8 i;
diff --git a/src/k_roulette.c b/src/k_roulette.c
index 55bcc7a24..e3db1838a 100644
--- a/src/k_roulette.c
+++ b/src/k_roulette.c
@@ -350,9 +350,6 @@ botItemPriority_e K_GetBotItemPriority(kartitems_t result)
 		case KITEM_INVINCIBILITY:
 		case KITEM_GROW:
 		case KITEM_SHRINK:
-		case KITEM_LIGHTNINGSHIELD:
-		case KITEM_BUBBLESHIELD:
-		case KITEM_FLAMESHIELD:
 		{
 			// Items that drastically improve your own defense and/or speed.
 			return BOT_ITEM_PR_POWER;
@@ -389,6 +386,9 @@ botItemPriority_e K_GetBotItemPriority(kartitems_t result)
 		case KITEM_JAWZ:
 		case KITEM_BANANA:
 		case KITEM_MINE:
+		case KITEM_LIGHTNINGSHIELD:
+		case KITEM_BUBBLESHIELD:
+		case KITEM_FLAMESHIELD:
 		{
 			// Used in all other instances (close to other players, no priority override)
 			// Typically attack items that give you protection.