diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp
index e2d0e25c47..8cbabbed25 100644
--- a/Core/Reporting.cpp
+++ b/Core/Reporting.cpp
@@ -209,7 +209,7 @@ namespace Reporting
 		postdata.Add("sdkver", sceKernelGetCompiledSdkVersion());
 		postdata.Add("pixel_width", PSP_CoreParameter().pixelWidth);
 		postdata.Add("pixel_height", PSP_CoreParameter().pixelHeight);
-		postdata.Add("ticks", CoreTiming::GetTicks());
+		postdata.Add("ticks", (const uint64_t)CoreTiming::GetTicks());
 
 		if (g_Config.bShowFPSCounter)
 		{
@@ -269,4 +269,4 @@ namespace Reporting
 		th.detach();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/Qt/Core.pro b/Qt/Core.pro
index 0225c87612..a81eea68dc 100755
--- a/Qt/Core.pro
+++ b/Qt/Core.pro
@@ -36,6 +36,7 @@ SOURCES += ../Core/CPU.cpp \ # Core
 	../Core/Config.cpp \
 	../Core/Core.cpp \
 	../Core/CoreTiming.cpp \
+	../Core/CwCheat.cpp \
 	../Core/Host.cpp \
 	../Core/Loaders.cpp \
 	../Core/MemMap.cpp \
@@ -69,6 +70,7 @@ HEADERS += ../Core/CPU.h \
 	../Core/Core.h \
 	../Core/CoreParameter.h \
 	../Core/CoreTiming.h \
+	../Core/CwCheat.h \
 	../Core/Host.h \
 	../Core/Loaders.h \
 	../Core/MemMap.h \
diff --git a/ffmpeg b/ffmpeg
index fe9c6b483d..07b19a15f0 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit fe9c6b483d42c2e481deea97fb6a382c050c10f2
+Subproject commit 07b19a15f0e3bae77605028448642c711796efdf