diff --git a/src/player_select_menus.c b/src/player_select_menus.c
index a940e8cda..2949c30fe 100644
--- a/src/player_select_menus.c
+++ b/src/player_select_menus.c
@@ -277,17 +277,17 @@ static void DrawNameMenu(GraphicsDevice *g, Vec2i pos, Vec2i size, void *data)
 
 	for (i = 0; i < (int)strlen(letters); i++)
 	{
-		Vec2i pos = Vec2iNew(
+		Vec2i menuPos = Vec2iNew(
 			x + (i % ENTRY_COLS) * ENTRY_SPACING,
 			y + (i / ENTRY_COLS) * CDogsTextHeight());
 
 		if (i == d->nameMenuSelection)
 		{
-			DrawTextCharMasked(letters[i], g, pos, colorRed);
+			DrawTextCharMasked(letters[i], g, menuPos, colorRed);
 		}
 		else
 		{
-			DrawTextCharMasked(letters[i], g, pos, colorWhite);
+			DrawTextCharMasked(letters[i], g, menuPos, colorWhite);
 		}
 	}
 
diff --git a/src/weapon_menu.c b/src/weapon_menu.c
index 2743185c2..b816db5da 100644
--- a/src/weapon_menu.c
+++ b/src/weapon_menu.c
@@ -43,7 +43,7 @@ static void WeaponSelect(menu_t *menu, int cmd, void *data)
 		// Add the selected weapon
 
 		// Check that the weapn hasn't been chosen yet
-		int selectedWeapon = gMission.availableWeapons[menu->u.normal.index];
+		gun_e selectedWeapon = gMission.availableWeapons[menu->u.normal.index];
 		int i;
 		for (i = 0; i < p->weaponCount; i++)
 		{