diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index b7f692460..4be3d78cf 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -375,7 +375,7 @@ static void PrecacheSounds(void)
 		if (pNode->ResType() == NAME_RAW || pNode->ResType() == NAME_SFX)
 		{
 			pNode->Get();
-			if ((i&15) == 15) gameHandleEvents();	// don't do this too often. That made sense in 1996 but not in 2019
+			//if ((i&15) == 15) gameHandleEvents();	// don't do this too often. That made sense in 1996 but not in 2019
 		}
 	}
 }
diff --git a/source/common/filesystem/file_directory.cpp b/source/common/filesystem/file_directory.cpp
index bbc6d23f5..30686bf77 100644
--- a/source/common/filesystem/file_directory.cpp
+++ b/source/common/filesystem/file_directory.cpp
@@ -149,8 +149,10 @@ int FDirectory::AddDirectory(const char *dirpath)
 					(fi[1] == '\0' ||
 					 (fi[1] == '.' && fi[2] == '\0'))))
 				{
-					// Skip if requested and do not record . and .. directories.
-					continue;
+					// Movie and music subdirectories must always pass.
+					if (fi.CompareNoCase("movie") && fi.CompareNoCase("music"))
+						// Skip if requested and do not record . and .. directories.
+						continue;
 				}
 				FString newdir = dirpath;
 				newdir << fi << '/';
diff --git a/source/common/initfs.cpp b/source/common/initfs.cpp
index cb9bda281..762825867 100644
--- a/source/common/initfs.cpp
+++ b/source/common/initfs.cpp
@@ -129,7 +129,7 @@ bool D_AddFile (TArray<FString> &wadfiles, const char *file, bool check = true,
 
 	if (check && !DirEntryExists (file))
 	{
-		const char *f = BaseFileSearch (file, ".wad", false);
+		const char *f = BaseFileSearch (file, ".grp", false);
 		if (f == NULL)
 		{
 			Printf ("Can't find '%s'\n", file);