diff --git a/src/dehacked.c b/src/dehacked.c
index 35b0ce4b1..41d41405c 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1200,7 +1200,7 @@ static void readlevelheader(MYFILE *f, INT32 num)
 				else if (fastcmp(word2, "NIGHTSLINK")) i =  4;
 				else if (fastcmp(word2, "NIGHTSALL")) i =  5;
 
-				if (i >= -1 && i <= 2) // -1 for no bonus. Max is 2.
+				if (i >= -1 && i <= 5) // -1 for no bonus. Max is 2.
 					mapheaderinfo[num-1]->bonustype = (SINT8)i;
 				else
 					deh_warning("Level header %d: invalid bonus type number %d", num, i);
diff --git a/src/y_inter.c b/src/y_inter.c
index b3603bb34..de0335523 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1852,14 +1852,14 @@ bonus_f bonuses_list[7][4] = {
 	},
 	{
 		Y_SetNullBonus,
-		Y_SetNightsBonus,
 		Y_SetNullBonus,
+		Y_SetNightsBonus,
 		Y_SetNullBonus,
 	},
 	{
 		Y_SetNullBonus,
-		Y_SetLinkBonus,
 		Y_SetNullBonus,
+		Y_SetLinkBonus,
 		Y_SetNullBonus,
 	},
 	{