diff --git a/lib/framework/exceptionhandler.c b/lib/framework/exceptionhandler.c
index 345dcc2b1..ad9da1647 100644
--- a/lib/framework/exceptionhandler.c
+++ b/lib/framework/exceptionhandler.c
@@ -119,7 +119,8 @@ static struct sigaction oldAction[NSIG];
 
 static struct utsname sysInfo;
 static BOOL gdbIsAvailable = FALSE, sysInfoValid = FALSE;
-static char programPID[MAX_PID_STRING] = {'\0'}, gdbPath[MAX_PATH] = {'\0'}, * gdmpPath = NULL, * programCommand = NULL;
+static char programPID[MAX_PID_STRING] = {'\0'}, gdbPath[MAX_PATH] = {'\0'}, * programCommand = NULL;
+static const char *gdmpPath;
 
 
 /**
diff --git a/src/multiplay.c b/src/multiplay.c
index 94edf6c24..c7edee6fb 100644
--- a/src/multiplay.c
+++ b/src/multiplay.c
@@ -506,7 +506,7 @@ char *getPlayerName(UDWORD player)
 	return NetPlay.players[0].name;
 }
 
-BOOL setPlayerName(UDWORD player, char *sName)
+BOOL setPlayerName(UDWORD player, const char *sName)
 {
 	if(player > MAX_PLAYERS)
 	{
diff --git a/src/multiplay.h b/src/multiplay.h
index feb397305..c65392f58 100644
--- a/src/multiplay.h
+++ b/src/multiplay.h
@@ -234,7 +234,7 @@ extern DROID_TEMPLATE	*IdToTemplate(UDWORD tempId,UDWORD player);
 extern DROID_TEMPLATE	*NameToTemplate(const char *sName,UDWORD player);
 
 extern char *getPlayerName	(UDWORD player);
-extern BOOL setPlayerName		(UDWORD player, char *sName);
+extern BOOL setPlayerName		(UDWORD player, const char *sName);
 extern char *getPlayerColourName(SDWORD player);
 extern BOOL isHumanPlayer		(UDWORD player);				//to tell if the player is a computer or not.
 extern BOOL myResponsibility	(UDWORD player);