diff --git a/src/common/engine/namedef.h b/src/common/engine/namedef.h
index 89ee863eab..7f98beba08 100644
--- a/src/common/engine/namedef.h
+++ b/src/common/engine/namedef.h
@@ -87,9 +87,6 @@ xx(SoundSlot5)
 xx(SoundSlot6)
 xx(SoundSlot7)
 
-// Actor properties
-xx(BobPivot3D)
-
 xx(LevelLocals)
 xx(Level)
 
diff --git a/src/common/filesystem/source/files_decompress.cpp b/src/common/filesystem/source/files_decompress.cpp
index 95cce3c330..9d00ee6dfa 100644
--- a/src/common/filesystem/source/files_decompress.cpp
+++ b/src/common/filesystem/source/files_decompress.cpp
@@ -980,7 +980,7 @@ bool OpenDecompressor(FileReader& self, FileReader &parent, FileReader::Size len
 			}
 			dec->Length = length;
 		}
-		if ((flags & DCF_CACHED))
+		if ((flags & (DCF_CACHED| DCF_SEEKABLE))) // the buffering reader does not seem to be stable, so cache it instead until we find out what's wrong.
 		{
 			// read everything into a MemoryArrayReader.
 			FileData data(nullptr, length);
diff --git a/src/common/filesystem/source/filesystem.cpp b/src/common/filesystem/source/filesystem.cpp
index a8418956fa..fee5f10114 100644
--- a/src/common/filesystem/source/filesystem.cpp
+++ b/src/common/filesystem/source/filesystem.cpp
@@ -395,7 +395,7 @@ void FileSystem::AddFile (const char *filename, FileReader *filer, LumpFilterInf
 				std::string path = filename;
 				path += ':';
 				path += resfile->getName(i);
-				auto embedded = resfile->GetEntryReader(i, READER_NEW, READERFLAG_SEEKABLE);
+				auto embedded = resfile->GetEntryReader(i, READER_CACHED);
 				AddFile(path.c_str(), &embedded, filter, Printf, hashfile);
 			}
 		}
diff --git a/src/common/rendering/hwrenderer/data/hw_cvars.h b/src/common/rendering/hwrenderer/data/hw_cvars.h
index ba8c9cec69..cf23649799 100644
--- a/src/common/rendering/hwrenderer/data/hw_cvars.h
+++ b/src/common/rendering/hwrenderer/data/hw_cvars.h
@@ -54,5 +54,3 @@ EXTERN_CVAR(Int, gl_shadowmap_filter)
 EXTERN_CVAR(Bool, gl_brightfog)
 EXTERN_CVAR(Bool, gl_lightadditivesurfaces)
 EXTERN_CVAR(Bool, gl_notexturefill)
-
-EXTERN_CVAR(Bool, r_drawplayersprites)
diff --git a/src/common/utility/findfile.cpp b/src/common/utility/findfile.cpp
index 86d7098ec0..65090cc903 100644
--- a/src/common/utility/findfile.cpp
+++ b/src/common/utility/findfile.cpp
@@ -90,7 +90,7 @@ bool D_AddFile(std::vector<std::string>& wadfiles, const char* file, bool check,
 				closedir(d);
 				if (!found)
 				{
-					Printf("Can't find file '%s' in '%s'\n", filename.GetChars(), basepath.GetChars());
+					//Printf("Can't find file '%s' in '%s'\n", filename.GetChars(), basepath.GetChars());
 					return false;
 				}
 			}
diff --git a/src/namedef_custom.h b/src/namedef_custom.h
index c66b3b3176..2da881531d 100644
--- a/src/namedef_custom.h
+++ b/src/namedef_custom.h
@@ -12,6 +12,9 @@ xx(BloodSplatter)
 xx(AxeBlood)
 xx(Spray)
 
+// Actor properties
+xx(BobPivot3D)
+
 // Invulnerability types
 xx(Ghost)
 xx(Reflective)