diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
index b00e0c64..f0c8f5a6 100644
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
@@ -10,11 +10,11 @@ cmake_minimum_required(VERSION 2.6)
 # maybe add these as options:
 # BUILD_GAMEPAK
 # TARGET_MONO
-# TARGET_DEMO		-DID_DEMO_BUILD
 # SETUP
 # SDK				-D_D3SDK
 
 # don't add these as options, but document them?
+# TARGET_DEMO		there are no demo pk4s compatible to this 1.3.1 codebase
 # IDNET_HOST		-DIDNET_HOST=\\"%s\\"' % IDNET_HOST
 # DEBUG_MEMORY		-DID_DEBUG_MEMORY', '-DID_REDIRECT_NEWDELETE
 # LIBC_MALLOC		-DUSE_LIBC_MALLOC=0
diff --git a/neo/framework/FileSystem.cpp b/neo/framework/FileSystem.cpp
index 01a21ef7..23f2800e 100644
--- a/neo/framework/FileSystem.cpp
+++ b/neo/framework/FileSystem.cpp
@@ -850,7 +850,7 @@ search paths.
 */
 const char *idFileSystemLocal::OSPathToRelativePath( const char *OSPath ) {
 	static char relativePath[MAX_STRING_CHARS];
-	char *s, *base;
+	const char *s, *base;
 
 	// skip a drive letter?
 
@@ -871,7 +871,7 @@ const char *idFileSystemLocal::OSPathToRelativePath( const char *OSPath ) {
 	}
 #else
 	// look for the first complete directory name
-	base = (char *)strstr( OSPath, BASE_GAMEDIR );
+	base = strstr( OSPath, BASE_GAMEDIR );
 	while ( base ) {
 		char c1 = '\0', c2;
 		if ( base > OSPath ) {
@@ -895,7 +895,7 @@ const char *idFileSystemLocal::OSPathToRelativePath( const char *OSPath ) {
 			fsgame = fs_game_base.GetString();
 		}
 		if ( base == NULL && fsgame && strlen( fsgame ) ) {
-			base = (char *)strstr( OSPath, fsgame );
+			base = strstr( OSPath, fsgame );
 			while ( base ) {
 				char c1 = '\0', c2;
 				if ( base > OSPath ) {