diff --git a/README.md b/README.md
index e4fbc924c..0e9fa40b6 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 2887.
+This is the source code for early-access 2888.
 
 ## Legal Notice
 
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 083a94ba7..28784d556 100755
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -42,8 +42,8 @@ add_custom_command(OUTPUT scm_rev.cpp
 )
 
 add_library(common STATIC
-    address_space.h
     address_space.cpp
+    address_space.h
     algorithm.h
     alignment.h
     announce_multiplayer_room.h
diff --git a/src/common/multi_level_page_table.cpp b/src/common/multi_level_page_table.cpp
index 3a7a75aa7..46e362f3b 100755
--- a/src/common/multi_level_page_table.cpp
+++ b/src/common/multi_level_page_table.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2021 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "common/multi_level_page_table.inc"
 
 namespace Common {
diff --git a/src/core/core.cpp b/src/core/core.cpp
index e8ccc8ad8..0e4e2f427 100755
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -444,9 +444,9 @@ struct System::Impl {
     std::unique_ptr<FileSys::ContentProviderUnion> content_provider;
     Service::FileSystem::FileSystemController fs_controller;
     /// AppLoader used to load the current executing application
-    std::unique_ptr<Tegra::Host1x::Host1x> host1x_core;
     std::unique_ptr<Loader::AppLoader> app_loader;
     std::unique_ptr<Tegra::GPU> gpu_core;
+    std::unique_ptr<Tegra::Host1x::Host1x> host1x_core;
     std::unique_ptr<Core::DeviceMemory> device_memory;
     std::unique_ptr<AudioCore::AudioCore> audio_core;
     Core::Memory::Memory memory;
@@ -656,14 +656,6 @@ const Core::Memory::Memory& System::Memory() const {
     return impl->memory;
 }
 
-Tegra::Host1x::Host1x& System::Host1x() {
-    return *impl->host1x_core;
-}
-
-const Tegra::Host1x::Host1x& System::Host1x() const {
-    return *impl->host1x_core;
-}
-
 Tegra::GPU& System::GPU() {
     return *impl->gpu_core;
 }
@@ -672,6 +664,14 @@ const Tegra::GPU& System::GPU() const {
     return *impl->gpu_core;
 }
 
+Tegra::Host1x::Host1x& System::Host1x() {
+    return *impl->host1x_core;
+}
+
+const Tegra::Host1x::Host1x& System::Host1x() const {
+    return *impl->host1x_core;
+}
+
 VideoCore::RendererBase& System::Renderer() {
     return impl->gpu_core->Renderer();
 }
diff --git a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
index 18c5324a9..4122fc98d 100755
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
@@ -50,8 +50,8 @@ void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, android::PixelFormat form
     const Tegra::FramebufferConfig framebuffer{addr,   offset, width,     height,
                                                stride, format, transform, crop_rect};
 
-    system.GetPerfStats().EndSystemFrame();
     system.GPU().RequestSwapBuffers(&framebuffer, fences, num_fences);
+    system.GetPerfStats().EndSystemFrame();
     system.SpeedLimiter().DoSpeedLimiting(system.CoreTiming().GetGlobalTimeUs());
     system.GetPerfStats().BeginSystemFrame();
 }