diff --git a/src/core/system.cpp b/src/core/system.cpp
index c80a60891..28c7b99fc 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -5717,6 +5717,13 @@ void System::ToggleSoftwareRendering()
                                       Settings::GetRendererDisplayName(new_renderer)),
                           Host::OSD_QUICK_DURATION);
   RecreateGPU(new_renderer);
+
+  // Might have a thread change.
+  if (const Threading::Thread* sw_thread = g_gpu->GetSWThread(); sw_thread)
+    s_last_sw_time = sw_thread->GetCPUTime();
+  else
+    s_last_sw_time = 0;
+
   g_gpu->UpdateResolutionScale();
 }
 
diff --git a/src/util/d3d11_device.cpp b/src/util/d3d11_device.cpp
index 37b63bb92..fab554e72 100644
--- a/src/util/d3d11_device.cpp
+++ b/src/util/d3d11_device.cpp
@@ -1080,7 +1080,7 @@ void D3D11Device::UnbindTexture(D3D11Texture* tex)
     {
       if (m_current_render_targets[i] == tex)
       {
-        WARNING_LOG("Unbinding current RT");
+        DEV_LOG("Unbinding current RT");
         SetRenderTargets(nullptr, 0, m_current_depth_target);
         break;
       }
@@ -1088,7 +1088,7 @@ void D3D11Device::UnbindTexture(D3D11Texture* tex)
   }
   else if (tex->IsDepthStencil() && m_current_depth_target == tex)
   {
-    WARNING_LOG("Unbinding current DS");
+    DEV_LOG("Unbinding current DS");
     SetRenderTargets(nullptr, 0, nullptr);
   }
 }
diff --git a/src/util/metal_device.mm b/src/util/metal_device.mm
index 518b0a6d7..2616318f8 100644
--- a/src/util/metal_device.mm
+++ b/src/util/metal_device.mm
@@ -2012,7 +2012,7 @@ void MetalDevice::UnbindTexture(MetalTexture* tex)
     {
       if (m_current_render_targets[i] == tex)
       {
-        WARNING_LOG("Unbinding current RT");
+        DEV_LOG("Unbinding current RT");
         SetRenderTargets(nullptr, 0, m_current_depth_target, GPUPipeline::NoRenderPassFlags); // TODO: Wrong
         break;
       }
@@ -2022,7 +2022,7 @@ void MetalDevice::UnbindTexture(MetalTexture* tex)
   {
     if (m_current_depth_target == tex)
     {
-      WARNING_LOG("Unbinding current DS");
+      DEV_LOG("Unbinding current DS");
       SetRenderTargets(nullptr, 0, nullptr, GPUPipeline::NoRenderPassFlags);
     }
   }
diff --git a/src/util/opengl_device.cpp b/src/util/opengl_device.cpp
index 7799d4cf3..ddca2d840 100644
--- a/src/util/opengl_device.cpp
+++ b/src/util/opengl_device.cpp
@@ -948,7 +948,7 @@ void OpenGLDevice::UnbindTexture(OpenGLTexture* tex)
     {
       if (m_current_render_targets[i] == tex)
       {
-        WARNING_LOG("Unbinding current RT");
+        DEV_LOG("Unbinding current RT");
         SetRenderTargets(nullptr, 0, m_current_depth_target);
         break;
       }
@@ -960,7 +960,7 @@ void OpenGLDevice::UnbindTexture(OpenGLTexture* tex)
   {
     if (m_current_depth_target == tex)
     {
-      WARNING_LOG("Unbinding current DS");
+      DEV_LOG("Unbinding current DS");
       SetRenderTargets(nullptr, 0, nullptr);
     }
 
diff --git a/src/util/vulkan_device.cpp b/src/util/vulkan_device.cpp
index e8b752527..b812f73f0 100644
--- a/src/util/vulkan_device.cpp
+++ b/src/util/vulkan_device.cpp
@@ -3692,7 +3692,7 @@ void VulkanDevice::UnbindTexture(VulkanTexture* tex)
     {
       if (m_current_render_targets[i] == tex)
       {
-        WARNING_LOG("Unbinding current RT");
+        DEV_LOG("Unbinding current RT");
         SetRenderTargets(nullptr, 0, m_current_depth_target);
         break;
       }
@@ -3704,7 +3704,7 @@ void VulkanDevice::UnbindTexture(VulkanTexture* tex)
   {
     if (m_current_depth_target == tex)
     {
-      WARNING_LOG("Unbinding current DS");
+      DEV_LOG("Unbinding current DS");
       SetRenderTargets(nullptr, 0, nullptr);
     }