diff --git a/neo/sys/posix/posix_main.cpp b/neo/sys/posix/posix_main.cpp
index 884349b8..2027a6dc 100644
--- a/neo/sys/posix/posix_main.cpp
+++ b/neo/sys/posix/posix_main.cpp
@@ -450,6 +450,11 @@ static int bt_pcinfo_callback( void *data, uintptr_t pc, const char *filename, i
 		if (name != NULL) {
 			function = name;
 		}
+
+		const char* fileNameNeo = strstr(filename, "/neo/");
+		if (fileNameNeo != NULL) {
+			filename = fileNameNeo+1; // I want "neo/bla/blub.cpp:42"
+		}
 		printf("  %zu %s:%d %s\n", pc, filename, lineno, function);
 		free(name);
 	}
diff --git a/neo/sys/win32/win_main.cpp b/neo/sys/win32/win_main.cpp
index 03df0d3f..759c7a60 100644
--- a/neo/sys/win32/win_main.cpp
+++ b/neo/sys/win32/win_main.cpp
@@ -677,7 +677,7 @@ void *Sys_DLL_GetProcAddress( uintptr_t dllHandle, const char *procName ) {
 	if (!adr)
 	{
 		DWORD e = GetLastError();
-		LPVOID msgBuf = nullptr;
+		LPVOID msgBuf = NULL;
 
 		FormatMessage(
 			FORMAT_MESSAGE_ALLOCATE_BUFFER |
diff --git a/neo/tools/debugger/DebuggerWindow.h b/neo/tools/debugger/DebuggerWindow.h
index f10422ab..949115a7 100644
--- a/neo/tools/debugger/DebuggerWindow.h
+++ b/neo/tools/debugger/DebuggerWindow.h
@@ -97,7 +97,7 @@ private:
 	void							UpdateTitle			( void );
 	void							UpdateCallstack		( void );
 	void							UpdateRecentFiles	( void );
-	bool							OpenScript			( const char* filename, int lineNumber = -1, idProgram* program = nullptr );
+	bool							OpenScript			( const char* filename, int lineNumber = -1, idProgram* program = NULL );
 	void							EnableWindows		( bool state );
 
 	int								GetSelectedText		( idStr& text );