diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.h b/stepmania/src/arch/ArchHooks/ArchHooks.h
index b028d4f536..3d765e9bd2 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks.h
+++ b/stepmania/src/arch/ArchHooks/ArchHooks.h
@@ -7,9 +7,9 @@ public:
 	virtual ~ArchHooks() { }
 
 	/*
-	 * Return the general name of the architecture, eg. "Windows", "OSX", "Unix".
+	 * Return the general name of the architecture, eg. "Windows", "OS X", "Unix".
 	 */
-	virtual RString GetArchName() { return "generic"; }
+	virtual RString GetArchName() const { return "generic"; }
 
 	/* This is called as soon as the loading window is shown, and we can
 	 * safely log. */
@@ -27,7 +27,7 @@ public:
 	/*
 	 * A string that uniquely identifies the machine in some way
 	 */
-	virtual RString GetMachineId() { return RString(); }
+	virtual RString GetMachineId() const { return RString(); }
 
 	/*
 	 * If this is a second instance, return true.  Optionally, give focus to the existing
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h
index 41b176dc85..cd29bf36a9 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.h
@@ -6,7 +6,7 @@ class ArchHooks_Unix: public ArchHooks
 {
 public:
 	ArchHooks_Unix();
-	RString GetArchName() { return "Unix"; }
+	RString GetArchName() const { return "Unix"; }
 	void DumpDebugInfo();
 
 	void SetTime( tm newtime );
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
index 4e8e301c22..dbaf8a6394 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
@@ -75,7 +75,7 @@ static BOOL CALLBACK GetEnabledPopup( HWND hWnd, LPARAM lParam )
 
 static const RString CURRENT_VERSION_KEY = "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion";
 
-RString ArchHooks_Win32::GetMachineId()
+RString ArchHooks_Win32::GetMachineId() const
 {
 	RString s;
 	if( RegistryAccess::GetRegValue( CURRENT_VERSION_KEY, "ProductID", s ) )
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h
index 32068ca461..1a84a5c546 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h
@@ -9,10 +9,10 @@ class ArchHooks_Win32: public ArchHooks
 public:
 	ArchHooks_Win32();
 	~ArchHooks_Win32();
-	RString GetArchName() { return "Windows"; }
+	RString GetArchName() const { return "Windows"; }
 	void DumpDebugInfo();
 	void RestartProgram();
-	RString GetMachineId();
+	RString GetMachineId() const;
 	bool CheckForMultipleInstances();
 
 	int OldThreadPriority;
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp
index 72821b3bc2..5b60d49963 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp
@@ -133,7 +133,7 @@ ArchHooks_darwin::~ArchHooks_darwin()
 #endif
 }
 
-RString ArchHooks_darwin::GetMachineId()
+RString ArchHooks_darwin::GetMachineId() const
 {
 	RString ret;
 	CFMutableDictionaryRef dict = IOServiceMatching( "IOPlatformExpertDevice" );
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h
index 332f33f61c..525b64da5f 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_darwin.h
@@ -9,8 +9,8 @@ class ArchHooks_darwin : public ArchHooks
 public:
 	ArchHooks_darwin();
 	~ArchHooks_darwin();
-	RString GetArchName() { return "OS X"; }
-	RString GetMachineId();
+	RString GetArchName() const { return "OS X"; }
+	RString GetMachineId() const;
 	void DumpDebugInfo();
 	RString GetPreferredLanguage();
 	void EnterTimeCriticalSection();