diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index 08b6c29..6ffdb29 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -296,14 +296,14 @@ void EventThread::process(RGSSThreadData &rtData)
 					if (fullscreen)
 					{
 						/* Prevent fullscreen flicker */
-						strncpy(pendingTitle, rtData.config.game.title.c_str(),
+						strncpy(pendingTitle, rtData.config.windowTitle.c_str(),
 						        sizeof(pendingTitle));
 						havePendingTitle = true;
 
 						break;
 					}
 
-					SDL_SetWindowTitle(win, rtData.config.game.title.c_str());
+					SDL_SetWindowTitle(win, rtData.config.windowTitle.c_str());
 				}
 
 				break;
@@ -410,7 +410,7 @@ void EventThread::process(RGSSThreadData &rtData)
 
 			case REQUEST_MESSAGEBOX :
 				SDL_ShowSimpleMessageBox(event.user.code,
-				                         rtData.config.game.title.c_str(),
+				                         rtData.config.windowTitle.c_str(),
 				                         (const char*) event.user.data1, win);
 				free(event.user.data1);
 				msgBoxDone.set();
@@ -429,7 +429,7 @@ void EventThread::process(RGSSThreadData &rtData)
 					break;
 
 				snprintf(buffer, sizeof(buffer), "%s - %d FPS",
-				         rtData.config.game.title.c_str(), event.user.code);
+				         rtData.config.windowTitle.c_str(), event.user.code);
 
 				/* Updating the window title in fullscreen
 				 * mode seems to cause flickering */
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index f27b3bd..8e50ee8 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -523,7 +523,7 @@ void FileSystem::initFontSets(SharedFontState &sfs)
 {
 	FontSetsCBData d = { p, &sfs };
 
-	PHYSFS_enumerate(".", findFontsFolderCB, &d);
+	PHYSFS_enumerate("", findFontsFolderCB, &d);
 }
 
 struct OpenReadEnumData
diff --git a/src/main.cpp b/src/main.cpp
index bed78e5..8e06164 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -353,13 +353,13 @@ int main(int argc, char *argv[])
 	if (rtData.rqTermAck)
 		SDL_WaitThread(rgssThread, 0);
 	else
-		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.game.title.c_str(),
+		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(),
 		                         "The RGSS script seems to be stuck and mkxp will now force quit", win);
 
 	if (!rtData.rgssErrorMsg.empty())
 	{
 		Debug() << rtData.rgssErrorMsg;
-		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.game.title.c_str(),
+		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(),
 		                         rtData.rgssErrorMsg.c_str(), win);
 	}
 
diff --git a/src/rgssad.cpp b/src/rgssad.cpp
index 4b51472..ac8772a 100644
--- a/src/rgssad.cpp
+++ b/src/rgssad.cpp
@@ -297,6 +297,8 @@ processDirectories(RGSS_archiveData *data, BoostSet<std::string> &topLevel,
 
 		if (slash)
 			nameBuf[i] = '/';
+
+		break;
 	}
 
 	/* Check for more entries */