diff --git a/src/imgui b/src/imgui
index 8c4dceba..49da9bab 160000
--- a/src/imgui
+++ b/src/imgui
@@ -1 +1 @@
-Subproject commit 8c4dceba08ce053ca431540bde43417432e1495e
+Subproject commit 49da9bab17d24ede9253b0dcc9faff556fbde152
diff --git a/src/ngscopeclient/TextureManager.cpp b/src/ngscopeclient/TextureManager.cpp
index 56f2bc09..4e2ed404 100644
--- a/src/ngscopeclient/TextureManager.cpp
+++ b/src/ngscopeclient/TextureManager.cpp
@@ -1,8 +1,8 @@
 /***********************************************************************************************************************
 *                                                                                                                      *
-* glscopeclient                                                                                                        *
+* ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2022 Andrew D. Zonenberg                                                                          *
+* Copyright (c) 2012-2024 Andrew D. Zonenberg                                                                          *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -124,7 +124,8 @@ Texture::Texture(
 		);
 	m_view = make_unique<vk::raii::ImageView>(*g_vkComputeDevice, vinfo);
 
-	m_texture = ImGui_ImplVulkan_AddTexture(**mgr->GetSampler(), **m_view, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+	m_texture = reinterpret_cast<intptr_t>(
+		ImGui_ImplVulkan_AddTexture(**mgr->GetSampler(), **m_view, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL));
 
 	SetName(name);
 }
@@ -177,7 +178,8 @@ Texture::Texture(
 		);
 	m_view = make_unique<vk::raii::ImageView>(*g_vkComputeDevice, vinfo);
 
-	m_texture = ImGui_ImplVulkan_AddTexture(**mgr->GetSampler(), **m_view, VK_IMAGE_LAYOUT_GENERAL);
+	m_texture = reinterpret_cast<intptr_t>(
+		ImGui_ImplVulkan_AddTexture(**mgr->GetSampler(), **m_view, VK_IMAGE_LAYOUT_GENERAL));
 
 	SetName(name);
 }
@@ -199,7 +201,7 @@ void Texture::SetName(const string& name)
 		g_vkComputeDevice->setDebugUtilsObjectNameEXT(
 			vk::DebugUtilsObjectNameInfoEXT(
 				vk::ObjectType::eDescriptorSet,
-				reinterpret_cast<uint64_t>(m_texture),
+				m_texture,
 				texName.c_str()));
 
 		g_vkComputeDevice->setDebugUtilsObjectNameEXT(
diff --git a/src/ngscopeclient/WaveformArea.cpp b/src/ngscopeclient/WaveformArea.cpp
index 8faeffe7..4053b9b9 100644
--- a/src/ngscopeclient/WaveformArea.cpp
+++ b/src/ngscopeclient/WaveformArea.cpp
@@ -2375,7 +2375,7 @@ void WaveformArea::RenderYAxis(ImVec2 size, map<float, float>& gridmap, float vb
 	ImGui::Dummy(size);
 
 	//Catch mouse wheel events
-	ImGui::SetItemUsingMouseWheel();
+	ImGui::SetItemKeyOwner(ImGuiKey_MouseWheelY);
 	if(ImGui::IsItemHovered())
 	{
 		auto wheel = ImGui::GetIO().MouseWheel;
diff --git a/src/ngscopeclient/WaveformGroup.cpp b/src/ngscopeclient/WaveformGroup.cpp
index b755077d..5d204bd4 100644
--- a/src/ngscopeclient/WaveformGroup.cpp
+++ b/src/ngscopeclient/WaveformGroup.cpp
@@ -860,7 +860,7 @@ void WaveformGroup::RenderTimeline(float width, float height)
 	if( (mouseDelta.x != 0) || (mouseDelta.y != 0) )
 		m_tLastMouseMove = tnow;
 
-	ImGui::SetItemUsingMouseWheel();
+	ImGui::SetItemKeyOwner(ImGuiKey_MouseWheelY);
 	if(ImGui::IsItemHovered())
 	{
 		//Catch mouse wheel events