diff --git a/README.md b/README.md
index 96853c1c1..8eaac9955 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 3579.
+This is the source code for early-access 3580.
 
 ## Legal Notice
 
diff --git a/src/common/scratch_buffer.h b/src/common/scratch_buffer.h
index fd01dacb7..a69a5a7af 100755
--- a/src/common/scratch_buffer.h
+++ b/src/common/scratch_buffer.h
@@ -90,13 +90,7 @@ public:
         return buffer_capacity;
     }
 
-    void swap(ScratchBuffer& other) {
-        std::swap(last_requested_size, other.last_requested_size);
-        std::swap(buffer_capacity, other.buffer_capacity);
-        std::swap(buffer, other.buffer);
-    }
-
-    void swap(ScratchBuffer&& other) {
+    void swap(ScratchBuffer& other) noexcept {
         std::swap(last_requested_size, other.last_requested_size);
         std::swap(buffer_capacity, other.buffer_capacity);
         std::swap(buffer, other.buffer);
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h
index 6592a1471..96b957316 100755
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -1297,10 +1297,10 @@ typename BufferCache<P>::OverlapResult BufferCache<P>::ResolveOverlaps(VAddr cpu
             // as a stream buffer. Increase the size to skip constantly recreating buffers.
             has_stream_leap = true;
             if (expands_right) {
-                begin -= YUZU_PAGESIZE * 256;
+                begin -= CACHING_PAGESIZE * 256;
                 // We're about to increment cpu_addr by YUZU_PAGESIZE, but have not yet checked for
                 // a buffer at the new begin.
-                cpu_addr = begin - YUZU_PAGESIZE;
+                cpu_addr = begin - CACHING_PAGESIZE;
             }
             if (expands_left) {
                 end += CACHING_PAGESIZE * 256;