diff --git a/.gitignore b/.gitignore
index cea62cad43..f6b8568f46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,3 @@ rpcs3/git-version.h
 !/bin/dev_hdd0/game/
 /bin/dev_hdd0/game/*
 !/bin/dev_hdd0/game/TEST12345/
-
-# Ignore other system generated files
-bin/dev_hdd0/home/00000001/trophy
diff --git a/bin/dev_hdd0/home/00000001/savedata/.gitignore b/bin/dev_hdd0/home/00000001/savedata/.gitignore
new file mode 100644
index 0000000000..8f6c3111a2
--- /dev/null
+++ b/bin/dev_hdd0/home/00000001/savedata/.gitignore
@@ -0,0 +1,6 @@
+# Note: This folder has to exist. Once the User Account manager is implemented, make sure it creates this folder in case it's missing and delete this .gitignore file.
+
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/bin/dev_hdd0/home/00000001/trophy/.gitignore b/bin/dev_hdd0/home/00000001/trophy/.gitignore
new file mode 100644
index 0000000000..8f6c3111a2
--- /dev/null
+++ b/bin/dev_hdd0/home/00000001/trophy/.gitignore
@@ -0,0 +1,6 @@
+# Note: This folder has to exist. Once the User Account manager is implemented, make sure it creates this folder in case it's missing and delete this .gitignore file.
+
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/rpcs3/Emu/FS/VFS.cpp b/rpcs3/Emu/FS/VFS.cpp
index 06cde64c6c..38ee1197b8 100644
--- a/rpcs3/Emu/FS/VFS.cpp
+++ b/rpcs3/Emu/FS/VFS.cpp
@@ -1,4 +1,3 @@
-#include <vector>
 #include "stdafx.h"
 #include "VFS.h"
 #include "Emu/HDD/HDD.h"
diff --git a/rpcs3/Emu/FS/VFS.h b/rpcs3/Emu/FS/VFS.h
index 93eba76873..f624ba6892 100644
--- a/rpcs3/Emu/FS/VFS.h
+++ b/rpcs3/Emu/FS/VFS.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <vector>
 #include "vfsDevice.h"
 
 enum vfsDeviceType
diff --git a/rpcs3/Emu/GS/GL/GLGSRender.h b/rpcs3/Emu/GS/GL/GLGSRender.h
index 3f8dc8ac39..e3ed1c35f8 100644
--- a/rpcs3/Emu/GS/GL/GLGSRender.h
+++ b/rpcs3/Emu/GS/GL/GLGSRender.h
@@ -294,7 +294,7 @@ public:
 		out.Create(tex.GetWidth(), tex.GetHeight(), data, alpha);
 		out.SaveFile(name, wxBITMAP_TYPE_PNG);
 
-		free(alldata);
+		delete[] alldata;
 		//free(data);
 		//free(alpha);
 	}
diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp
index 56bad1cf88..c866677099 100644
--- a/rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp
@@ -44,10 +44,9 @@ void sys_spinlock_unlock(mem_ptr_t<spinlock> lock)
 {
 	sys_spinlock.Log("sys_spinlock_unlock(lock_addr=0x%x)", lock.GetAddr());
 
-again:
-	switch (lock->mutex.unlock(lock->mutex.GetOwner()))
+	while(true)
 	{
-	case SMR_PERMITTED: goto again;
-	default: break;
+		if (lock->mutex.unlock(lock->mutex.GetOwner()) != SMR_PERMITTED)
+			break;
 	}
 }
\ No newline at end of file
diff --git a/rpcs3/Gui/VFSManager.h b/rpcs3/Gui/VFSManager.h
index aaff731a8d..a14358ae42 100644
--- a/rpcs3/Gui/VFSManager.h
+++ b/rpcs3/Gui/VFSManager.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <vector>
-
 class VFSEntrySettingsDialog : public wxDialog
 {
 	wxTextCtrl* m_tctrl_dev_path;
diff --git a/rpcs3/Loader/TROPUSR.cpp b/rpcs3/Loader/TROPUSR.cpp
index fc5a8fd0d3..03483701e9 100644
--- a/rpcs3/Loader/TROPUSR.cpp
+++ b/rpcs3/Loader/TROPUSR.cpp
@@ -19,6 +19,7 @@ bool TROPUSRLoader::Load(const std::string& filepath, const std::string& configp
 	if (m_file)
 		Close();
 
+	// TODO: This seems to be always true... A bug in ExistsFile() ?
 	if (!Emu.GetVFS().ExistsFile(filepath))
 		Generate(filepath, configpath);