diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp
index d12edef3ce..27c5d82e12 100644
--- a/src/audio_core/codec.cpp
+++ b/src/audio_core/codec.cpp
@@ -72,8 +72,8 @@ StereoBuffer16 DecodeADPCM(const u8* const data, const std::size_t sample_count,
         }
     }
 
-    state.yn1 = yn1;
-    state.yn2 = yn2;
+    state.yn1 = static_cast<s16>(yn1);
+    state.yn2 = static_cast<s16>(yn2);
 
     return ret;
 }
diff --git a/src/citra_qt/compatdb.cpp b/src/citra_qt/compatdb.cpp
index 17dd143109..4209b16cf8 100644
--- a/src/citra_qt/compatdb.cpp
+++ b/src/citra_qt/compatdb.cpp
@@ -59,7 +59,7 @@ void CompatDB::Submit() {
         button(QWizard::CancelButton)->setVisible(false);
 
         testcase_watcher.setFuture(QtConcurrent::run(
-            [this]() { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); }));
+            [] { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); }));
         break;
     default:
         LOG_ERROR(Frontend, "Unexpected page: {}", currentId());
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp
index fb84eff3ae..b932f9d6c7 100644
--- a/src/core/frontend/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -75,7 +75,7 @@ static bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigne
     }
 }
 
-std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) {
+std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) const {
     if (Settings::values.toggle_3d) {
         if (new_x >= framebuffer_layout.width / 2)
             new_x -= framebuffer_layout.width / 2;
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h
index 5fefcff54c..be3ff589aa 100644
--- a/src/core/frontend/emu_window.h
+++ b/src/core/frontend/emu_window.h
@@ -164,5 +164,5 @@ private:
     /**
      * Clip the provided coordinates to be inside the touchscreen area.
      */
-    std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y);
+    std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y) const;
 };