diff --git a/src/m_menu.c b/src/m_menu.c
index 54c0b6c874c6a600ee3c6bbdadfe8bc9e35a06c3..8fe782cac20fad747cc878b73f25432928f65b17 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -400,7 +400,8 @@ consvar_t cv_showfocuslost = {"showfocuslost", "Yes", CV_SAVE, CV_YesNo, NULL, 0
 
 static CV_PossibleValue_t map_cons_t[] = {
 	{1,"MIN"},
-	{NUMMAPS, "MAX"}
+	{NUMMAPS, "MAX"},
+	{0,NULL}
 };
 consvar_t cv_nextmap = {"nextmap", "1", CV_HIDEN|CV_CALL, map_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
diff --git a/src/p_user.c b/src/p_user.c
index 6169c3b1fd5e3bde14adc1f46bd758789c1629e4..d49a63bf73dedb1689756043e891926d52b299f6 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -11708,8 +11708,8 @@ void P_PlayerThink(player_t *player)
 	else
 		player->powers[pw_justsprung] = 0;
 
-	if (player->powers[pw_pushing] && player->powers[pw_pushing] < UINT16_MAX)
-		player->powers[pw_pushing]--;
+	if (player->powers[pw_noautobrake] && player->powers[pw_noautobrake] < UINT16_MAX)
+		player->powers[pw_noautobrake]--;
 
 	if (player->powers[pw_underwater] && (player->pflags & PF_GODMODE || (player->powers[pw_shield] & SH_PROTECTWATER)))
 	{