diff --git a/.editorconfig b/.editorconfig
index dde2e23117..24aff0d819 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,6 +15,10 @@ indent_size = 2
 [*.sh]
 end_of_line = lf
 
+[*.rc]
+indent_style = space
+indent_size = 4
+
 [Core/Dialog/PSPOskDialog.cpp]
 charset = utf-16le
 
@@ -22,5 +26,5 @@ charset = utf-16le
 # This file may need to force a BOM so compilers treat as utf-8.
 charset = utf-8-bom
 
-[Windows/version.rc]
+[Windows/{aboutbox.rc,version.rc}]
 charset = utf-16le
diff --git a/Core/HW/MemoryStick.cpp b/Core/HW/MemoryStick.cpp
index 2995f10055..42bc625bdb 100644
--- a/Core/HW/MemoryStick.cpp
+++ b/Core/HW/MemoryStick.cpp
@@ -9,7 +9,7 @@ static MemStickState memStickState;
 static MemStickFatState memStickFatState;
 static u64 memStickSize;
 static bool memStickNeedsAssign = false;
-static s64 memStickInsertedAt = 0;
+static u64 memStickInsertedAt = 0;
 
 void MemoryStick_DoState(PointerWrap &p) {
 	auto s = p.Section("MemoryStick", 1, 3);
diff --git a/Core/Screenshot.h b/Core/Screenshot.h
index 1f4bdd6d28..28292146bc 100644
--- a/Core/Screenshot.h
+++ b/Core/Screenshot.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-class GPUDebugBuffer;
+struct GPUDebugBuffer;
 
 enum ScreenshotFormat {
 	SCREENSHOT_PNG,
@@ -32,6 +32,6 @@ enum ScreenshotType {
 	SCREENSHOT_RENDER,
 };
 
-const u8 * ConvertBufferTo888RGB(const GPUDebugBuffer & buf, u8 *& temp, u32 & w, u32 & h);
+const u8 *ConvertBufferTo888RGB(const GPUDebugBuffer &buf, u8 *&temp, u32 &w, u32 &h);
 
 bool TakeGameScreenshot(const char *filename, ScreenshotFormat fmt, ScreenshotType type, int *width = nullptr, int *height = nullptr, int maxRes = -1);
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 233dfd8105..2288d2e824 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -405,13 +405,13 @@ BEGIN
         MENUITEM "Load State File...",                      ID_FILE_LOADSTATEFILE
         MENUITEM "Save State File...",                      ID_FILE_SAVESTATEFILE
 
-		POPUP "Record"
-		BEGIN
-		    MENUITEM "Record Display",                      ID_FILE_DUMPFRAMES
-		    MENUITEM "Use Lossless Video Codec (FFV1)",     ID_FILE_USEFFV1
+        POPUP "Record"
+        BEGIN
+            MENUITEM "Record Display",                      ID_FILE_DUMPFRAMES
+            MENUITEM "Use Lossless Video Codec (FFV1)",     ID_FILE_USEFFV1
             MENUITEM SEPARATOR
-		    MENUITEM "Record Audio",                        ID_FILE_DUMPAUDIO
-		END
+            MENUITEM "Record Audio",                        ID_FILE_DUMPAUDIO
+        END
         MENUITEM SEPARATOR
         MENUITEM "Exit",                                    ID_FILE_EXIT
     END
@@ -492,7 +492,7 @@ BEGIN
         BEGIN
             MENUITEM "Direct3D9" ID_OPTIONS_DIRECT3D9
             MENUITEM "OpenGL" ID_OPTIONS_OPENGL
-           	MENUITEM "Vulkan" ID_OPTIONS_VULKAN
+            MENUITEM "Vulkan" ID_OPTIONS_VULKAN
         END
 
         POPUP "Rendering Mode"