diff --git a/xwords4/relay/Makefile b/xwords4/relay/Makefile
index 67b5bece5..8b2ffbe6a 100644
--- a/xwords4/relay/Makefile
+++ b/xwords4/relay/Makefile
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-CXX = g++-4.1
+CXX = g++
 CC=$(CXX)
 SRC = xwrelay.cpp \
 	cref.cpp \
diff --git a/xwords4/relay/ctrl.cpp b/xwords4/relay/ctrl.cpp
index 7289de387..319bef00f 100644
--- a/xwords4/relay/ctrl.cpp
+++ b/xwords4/relay/ctrl.cpp
@@ -76,7 +76,7 @@ static bool cmd_uptime( int socket, const char** args );
 static bool cmd_crash( int socket, const char** args );
 
 static int
-match( string* cmd, char * const* first, int incr, int count )
+match( string* cmd, const char * const* first, int incr, int count )
 {
     int cmdlen = cmd->length();
     int nFound = 0;
@@ -226,7 +226,7 @@ cmd_get( int socket, const char** args )
     bool needsHelp = true;
 
     string attr(args[1]);
-    char* const attrs[] = { "help", "listeners", "loglevel" };
+    const char* const attrs[] = { "help", "listeners", "loglevel" };
     int index = match( &attr, attrs, sizeof(attrs[0]), 
                        sizeof(attrs)/sizeof(attrs[0]));
 
@@ -280,7 +280,7 @@ static bool
 cmd_set( int socket, const char** args )
 {
     const char* val = args[2];
-    char* const attrs[] = { "help", "listeners", "loglevel" };
+    const char* const attrs[] = { "help", "listeners", "loglevel" };
     string attr(args[1]);
     int index = match( &attr, attrs, sizeof(attrs[0]), 
                        sizeof(attrs)/sizeof(attrs[0]));