diff --git a/qrenderdoc/3rdparty/flowlayout/FlowLayout.cpp b/qrenderdoc/3rdparty/flowlayout/FlowLayout.cpp
index 862787a62..36e5a7e66 100644
--- a/qrenderdoc/3rdparty/flowlayout/FlowLayout.cpp
+++ b/qrenderdoc/3rdparty/flowlayout/FlowLayout.cpp
@@ -40,7 +40,8 @@
 
 #include <QtWidgets>
 
-#include "flowlayout.h"
+#include "FlowLayout.h"
+
 FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing)
     : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
 {
diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp
index f177bb752..de615c69a 100644
--- a/qrenderdoc/Windows/EventBrowser.cpp
+++ b/qrenderdoc/Windows/EventBrowser.cpp
@@ -186,7 +186,6 @@ void EventBrowser::on_timeDraws_clicked()
 
 		GUIInvoke::blockcall([this, results]() {
 			SetDrawcallTimes(ui->events->topLevelItem(0), results);
-			_CrtCheckMemory();
 		});
 	});
 }
diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h
index fa6d82d67..a5be48db8 100644
--- a/renderdoc/api/replay/renderdoc_replay.h
+++ b/renderdoc/api/replay/renderdoc_replay.h
@@ -60,8 +60,8 @@ typedef uint32_t bool32;
 extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_FreeArrayMem(const void *mem);
 typedef void (RENDERDOC_CC *pRENDERDOC_FreeArrayMem)(const void *mem);
 
-extern "C" RENDERDOC_API void *RENDERDOC_CC RENDERDOC_AllocArrayMem(size_t sz);
-typedef void *(RENDERDOC_CC *pRENDERDOC_AllocArrayMem)(size_t sz);
+extern "C" RENDERDOC_API void *RENDERDOC_CC RENDERDOC_AllocArrayMem(uint64_t sz);
+typedef void *(RENDERDOC_CC *pRENDERDOC_AllocArrayMem)(uint64_t sz);
 
 #include "basic_types.h"
 
diff --git a/renderdoc/replay/entry_points.cpp b/renderdoc/replay/entry_points.cpp
index dd7c56694..f0bb93edb 100644
--- a/renderdoc/replay/entry_points.cpp
+++ b/renderdoc/replay/entry_points.cpp
@@ -384,9 +384,9 @@ void RENDERDOC_CC RENDERDOC_FreeArrayMem(const void *mem)
 }
 
 extern "C" RENDERDOC_API
-void *RENDERDOC_CC RENDERDOC_AllocArrayMem(size_t sz)
+void *RENDERDOC_CC RENDERDOC_AllocArrayMem(uint64_t sz)
 {
-	return rdctype::array<char>::allocate(sz);
+	return rdctype::array<char>::allocate((size_t)sz);
 }
 
 extern "C" RENDERDOC_API