diff --git a/Core/FileSystems/MetaFileSystem.cpp b/Core/FileSystems/MetaFileSystem.cpp
index 26824e305..ae3db8de1 100644
--- a/Core/FileSystems/MetaFileSystem.cpp
+++ b/Core/FileSystems/MetaFileSystem.cpp
@@ -162,7 +162,7 @@ IFileSystem *MetaFileSystem::GetHandleOwner(u32 handle)
 	return 0;
 }
 
-bool MetaFileSystem::MapFilePath(const std::string &_inpath, std::string &outpath, System **system)
+bool MetaFileSystem::MapFilePath(const std::string &_inpath, std::string &outpath, MountPoint **system)
 {
 	std::string realpath;
 
@@ -212,7 +212,7 @@ bool MetaFileSystem::MapFilePath(const std::string &_inpath, std::string &outpat
 
 void MetaFileSystem::Mount(std::string prefix, IFileSystem *system)
 {
-	System x;
+	MountPoint x;
 	x.prefix=prefix;
 	x.system=system;
 	fileSystems.push_back(x);
@@ -242,10 +242,10 @@ void MetaFileSystem::Shutdown()
 u32 MetaFileSystem::OpenFile(std::string filename, FileAccess access)
 {
 	std::string of;
-	System *system;
+	IFileSystem *system;
 	if (MapFilePath(filename, of, &system))
 	{
-		return system->system->OpenFile(of, access);
+		return system->OpenFile(of, access);
 	}
 	else
 	{
@@ -256,10 +256,10 @@ u32 MetaFileSystem::OpenFile(std::string filename, FileAccess access)
 PSPFileInfo MetaFileSystem::GetFileInfo(std::string filename)
 {
 	std::string of;
-	System *system;
+	IFileSystem *system;
 	if (MapFilePath(filename, of, &system))
 	{
-		return system->system->GetFileInfo(of);
+		return system->GetFileInfo(of);
 	}
 	else
 	{
@@ -271,9 +271,9 @@ PSPFileInfo MetaFileSystem::GetFileInfo(std::string filename)
 bool MetaFileSystem::GetHostPath(const std::string &inpath, std::string &outpath)
 {
 	std::string of;
-	System *system;
+	IFileSystem *system;
 	if (MapFilePath(inpath, of, &system)) {
-		return system->system->GetHostPath(of, outpath);
+		return system->GetHostPath(of, outpath);
 	} else {
 		return false;
 	}
@@ -282,10 +282,10 @@ bool MetaFileSystem::GetHostPath(const std::string &inpath, std::string &outpath
 std::vector<PSPFileInfo> MetaFileSystem::GetDirListing(std::string path)
 {
 	std::string of;
-	System *system;
+	IFileSystem *system;
 	if (MapFilePath(path, of, &system))
 	{
-		return system->system->GetDirListing(of);
+		return system->GetDirListing(of);
 	}
 	else
 	{
@@ -304,10 +304,10 @@ void MetaFileSystem::ChDir(const std::string &dir)
 	int curThread = __KernelGetCurThread();
 	
 	std::string of;
-	System *system;
-	if (MapFilePath(dir, of, &system))
+	MountPoint *mountPoint;
+	if (MapFilePath(dir, of, &mountPoint))
 	{
-		currentDir[curThread] = system->prefix + of;
+		currentDir[curThread] = mountPoint->prefix + of;
 		//return true;
 	}
 	else
@@ -322,10 +322,10 @@ void MetaFileSystem::ChDir(const std::string &dir)
 bool MetaFileSystem::MkDir(const std::string &dirname)
 {
 	std::string of;
-	System *system;
+	IFileSystem *system;
 	if (MapFilePath(dirname, of, &system))
 	{
-		return system->system->MkDir(of);
+		return system->MkDir(of);
 	}
 	else
 	{
@@ -336,10 +336,10 @@ bool MetaFileSystem::MkDir(const std::string &dirname)
 bool MetaFileSystem::RmDir(const std::string &dirname)
 {
 	std::string of;
-	System *system;
+	IFileSystem *system;
 	if (MapFilePath(dirname, of, &system))
 	{
-		return system->system->RmDir(of);
+		return system->RmDir(of);
 	}
 	else
 	{
@@ -351,10 +351,10 @@ bool MetaFileSystem::RenameFile(const std::string &from, const std::string &to)
 {
 	std::string of;
 	std::string rf;
-	System *system;
+	IFileSystem *system;
 	if (MapFilePath(from, of, &system) && MapFilePath(to, rf, &system))
 	{
-		return system->system->RenameFile(of, rf);
+		return system->RenameFile(of, rf);
 	}
 	else
 	{
@@ -365,10 +365,10 @@ bool MetaFileSystem::RenameFile(const std::string &from, const std::string &to)
 bool MetaFileSystem::DeleteFile(const std::string &filename)
 {
 	std::string of;
-	System *system;
+	IFileSystem *system;
 	if (MapFilePath(filename, of, &system))
 	{
-		return system->system->DeleteFile(of);
+		return system->DeleteFile(of);
 	}
 	else
 	{
diff --git a/Core/FileSystems/MetaFileSystem.h b/Core/FileSystems/MetaFileSystem.h
index 3ce3766c6..b54e15361 100644
--- a/Core/FileSystems/MetaFileSystem.h
+++ b/Core/FileSystems/MetaFileSystem.h
@@ -23,12 +23,12 @@ class MetaFileSystem : public IHandleAllocator, public IFileSystem
 {
 private:
 	u32 current;
-	struct System
+	struct MountPoint
 	{
 		std::string prefix;
 		IFileSystem *system;
 	};
-	std::vector<System> fileSystems;
+	std::vector<MountPoint> fileSystems;
 
 	typedef std::map<int, std::string> currentDir_t;
 	currentDir_t currentDir;
@@ -54,7 +54,19 @@ public:
 	virtual void DoState(PointerWrap &p);
 
 	IFileSystem *GetHandleOwner(u32 handle);
-	bool MapFilePath(const std::string &inpath, std::string &outpath, System **system);
+	bool MapFilePath(const std::string &inpath, std::string &outpath, MountPoint **system);
+
+	inline bool MapFilePath(const std::string &_inpath, std::string &outpath, IFileSystem **system)
+	{
+		MountPoint *mountPoint;
+		if (MapFilePath(_inpath, outpath, &mountPoint))
+		{
+			*system = mountPoint->system;
+			return true;
+		}
+
+		return false;
+	}
 
 	// Only possible if a file system is a DirectoryFileSystem or similar.
 	bool GetHostPath(const std::string &inpath, std::string &outpath);