diff --git a/README.md b/README.md
index 2b133646d..549beb4b3 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 1436.
+This is the source code for early-access 1437.
 
 ## Legal Notice
 
diff --git a/src/input_common/udp/client.cpp b/src/input_common/udp/client.cpp
index e7e50d789..c4afa4174 100755
--- a/src/input_common/udp/client.cpp
+++ b/src/input_common/udp/client.cpp
@@ -144,6 +144,10 @@ Client::~Client() {
     Reset();
 }
 
+Client::ClientData::ClientData() = default;
+
+Client::ClientData::~ClientData() = default;
+
 std::vector<Common::ParamPackage> Client::GetInputDevices() const {
     std::vector<Common::ParamPackage> devices;
     for (std::size_t client = 0; client < clients.size(); client++) {
diff --git a/src/input_common/udp/client.h b/src/input_common/udp/client.h
index 822f9c550..a523f6124 100755
--- a/src/input_common/udp/client.h
+++ b/src/input_common/udp/client.h
@@ -98,6 +98,9 @@ public:
 
 private:
     struct ClientData {
+        ClientData();
+        ~ClientData();
+
         std::string host{"127.0.0.1"};
         u16 port{26760};
         std::size_t pad_index{};
diff --git a/src/input_common/udp/udp.cpp b/src/input_common/udp/udp.cpp
index b630281a0..9829da6f0 100755
--- a/src/input_common/udp/udp.cpp
+++ b/src/input_common/udp/udp.cpp
@@ -84,8 +84,8 @@ public:
 
 private:
     const std::string ip;
-    const u16 port;
-    const u16 pad;
+    [[maybe_unused]] const u16 port;
+    [[maybe_unused]] const u16 pad;
     CemuhookUDP::Client* client;
     mutable std::mutex mutex;
 };
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp
index fdc040f89..93a1a52e0 100755
--- a/src/video_core/renderer_opengl/gl_texture_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp
@@ -956,9 +956,10 @@ void ImageView::SetupView(const Device& device, Image& image, ImageViewType view
                       view_range.extent.levels, view_range.base.layer, view_range.extent.layers);
         if (!info.IsRenderTarget()) {
             auto swizzle = info.Swizzle();
-            if (IsPixelFormatBGR(image.info.format)) {
-                // Swap the R and B channels of the swizzle.
-                std::swap(swizzle[0], swizzle[2]);
+            if (IsPixelFormatBGR(image.info.format) || IsPixelFormatBGR(info.format)) {
+                // Explicitly swap the R and B channels of the swizzle.
+                swizzle[0] = SwizzleSource::R;
+                swizzle[2] = SwizzleSource::B;
             }
             ApplySwizzle(handle, format, swizzle);
         }