diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp
index 7818d72c9..280629014 100644
--- a/src/sdl/i_system.cpp
+++ b/src/sdl/i_system.cpp
@@ -359,7 +359,7 @@ int I_PickIWad (WadStuff *wads, int numwads)
 	printf ("Please select a game wad:\n");
 	for (i = 0; i < numwads; ++i)
 	{
-		char *filepart = strrchr (wads[i].Path, '/');
+		const char *filepart = strrchr (wads[i].Path, '/');
 		if (filepart == NULL)
 			filepart = wads[i].Path;
 		else
diff --git a/wadsrc/decorate/hexen/puzzleitems.txt b/wadsrc/decorate/hexen/puzzleitems.txt
index 603d2fe2f..bba74c403 100644
--- a/wadsrc/decorate/hexen/puzzleitems.txt
+++ b/wadsrc/decorate/hexen/puzzleitems.txt
@@ -54,7 +54,7 @@ ACTOR PuzzGemRed : PuzzleItem 9004
 
 // Green Gem 1 (Emerald Planet) ---------------------------------------------
 
-ACTOR PuzzGemGreen : PuzzleItem 9005
+ACTOR PuzzGemGreen1 : PuzzleItem 9005
 {
 	Game Hexen
 	SpawnID 79