diff --git a/rpcs3/Emu/Cell/MFC.h b/rpcs3/Emu/Cell/MFC.h
index 9f63247e1a..4523131b46 100644
--- a/rpcs3/Emu/Cell/MFC.h
+++ b/rpcs3/Emu/Cell/MFC.h
@@ -148,8 +148,8 @@ struct DMAC
 	u64 ls_offset;
 	u32 queue_pos;
 	u32 proxy_pos;
-	u32 queue_lock;
-	u32 proxy_lock;
+	long queue_lock;
+	long proxy_lock;
 
 	u32 Cmd(u32 cmd, u32 tag, u32 lsa, u64 ea, u32 size)
 	{
diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h
index 7e123062e8..7dc71b74f1 100644
--- a/rpcs3/Emu/Cell/SPUThread.h
+++ b/rpcs3/Emu/Cell/SPUThread.h
@@ -265,7 +265,7 @@ public:
 	private:
 		u32 m_value[max_count];
 		u32 m_index;
-		u32 m_lock;
+		long m_lock;
 
 	public:
 
diff --git a/rpcs3/Emu/FS/vfsDevice.cpp b/rpcs3/Emu/FS/vfsDevice.cpp
index 570e60dd52..d7fbc464a1 100644
--- a/rpcs3/Emu/FS/vfsDevice.cpp
+++ b/rpcs3/Emu/FS/vfsDevice.cpp
@@ -30,7 +30,11 @@ u32 vfsDevice::CmpPs3Path(const wxString& ps3_path)
 
 	for(u32 i=0; i<lim; ++i, ++ret)
 	{
-		if(m_ps3_path[i] != ps3_path[i]) break;
+		if(m_ps3_path[i] != ps3_path[i]) 
+		{
+			ret = 0;
+			break;
+		}
 	}
 
 	return ret;