diff --git a/lsfg-vk-backend/src/modules/pipeline.cpp b/lsfg-vk-backend/src/modules/pipeline.cpp
index 207abcb..c5f7d50 100644
--- a/lsfg-vk-backend/src/modules/pipeline.cpp
+++ b/lsfg-vk-backend/src/modules/pipeline.cpp
@@ -110,7 +110,7 @@ Pipeline::Pipeline(
     };
 
     // Create the Vulkan images
-    size_t alignment{};
+    vk::DeviceSize alignment{};
     uint32_t types{~0U};
 
     const vk::Extent2D flowExtent{
@@ -643,7 +643,7 @@ Pipeline::Pipeline(
         for (const auto& sampledImage : stage.sampledImages) {
             const auto& image = this->m_images.at(sampledImage);
             for (const auto& subimage : image.subimages) {
-                const vk::Image& imageHandle{*subimage.image};
+                auto imageHandle{static_cast<const VkImage>(*subimage.image)}; // NOLINT (32-bit)
                 if (stageBarriers.contains(imageHandle)) {
                     stageBarriers[imageHandle].dstAccessMask = vk::AccessFlagBits2::eShaderRead;
                     continue;
@@ -666,7 +666,7 @@ Pipeline::Pipeline(
         for (const auto& storageImage : stage.storageImages) {
             const auto& image = this->m_images.at(storageImage);
             for (const auto& subimage : image.subimages) {
-                const vk::Image& imageHandle{*subimage.image};
+                auto imageHandle{static_cast<const VkImage>(*subimage.image)}; // NOLINT (32-bit)
                 if (stageBarriers.contains(imageHandle)) {
                     stageBarriers[imageHandle].dstAccessMask = vk::AccessFlagBits2::eShaderWrite;
                     continue;
@@ -726,7 +726,7 @@ Pipeline::Pipeline(
         for (const auto& sampledImage : stage.sampledImages) {
             const auto& image = this->m_images.at(sampledImage);
             for (const auto& subimage : image.subimages) {
-                stageBarriers[*subimage.image] = {
+                stageBarriers[static_cast<VkImage>(*subimage.image)] = {
                     .srcStageMask = vk::PipelineStageFlagBits2::eComputeShader,
                     .srcAccessMask = vk::AccessFlagBits2::eShaderRead,
                     .dstStageMask = vk::PipelineStageFlagBits2::eComputeShader,
@@ -743,7 +743,7 @@ Pipeline::Pipeline(
         for (const auto& storageImage : stage.storageImages) {
             const auto& image = this->m_images.at(storageImage);
             for (const auto& subimage : image.subimages) {
-                stageBarriers[*subimage.image] = {
+                stageBarriers[static_cast<VkImage>(*subimage.image)] = {
                     .srcStageMask = vk::PipelineStageFlagBits2::eComputeShader,
                     .srcAccessMask = vk::AccessFlagBits2::eShaderWrite,
                     .dstStageMask = vk::PipelineStageFlagBits2::eComputeShader,
diff --git a/lsfg-vk-backend/src/utility/vkhelper.cpp b/lsfg-vk-backend/src/utility/vkhelper.cpp
index 85b0e82..499b9c6 100644
--- a/lsfg-vk-backend/src/utility/vkhelper.cpp
+++ b/lsfg-vk-backend/src/utility/vkhelper.cpp
@@ -411,7 +411,7 @@ vk::UniqueDeviceMemory vkhelper::allocateMemory(
     const vk::detail::DispatchLoaderDynamic& dld,
     const vk::Device& device,
     const vk::PhysicalDevice& physdev,
-    size_t size,
+    vk::DeviceSize size,
     std::bitset<32> types,
     bool hostVisible
 ) {
diff --git a/lsfg-vk-backend/src/utility/vkhelper.hpp b/lsfg-vk-backend/src/utility/vkhelper.hpp
index af5c620..8b871d7 100644
--- a/lsfg-vk-backend/src/utility/vkhelper.hpp
+++ b/lsfg-vk-backend/src/utility/vkhelper.hpp
@@ -3,6 +3,7 @@
 #pragma once
 
 #define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
+#define VULKAN_HPP_TYPESAFE_CONVERSION 0
 #define VULKAN_HPP_NO_DEFAULT_DISPATCHER 1
 #define VULKAN_HPP_NO_CONSTRUCTORS 1
 #define VULKAN_HPP_NO_SETTERS 1
@@ -272,7 +273,7 @@ namespace vkhelper {
         const vk::detail::DispatchLoaderDynamic& dld,
         const vk::Device& device,
         const vk::PhysicalDevice& physdev,
-        size_t size,
+        vk::DeviceSize size,
         std::bitset<32> types,
         bool hostVisible = false
     );