diff --git a/kernel/kernel/Device/FramebufferDevice.cpp b/kernel/kernel/Device/FramebufferDevice.cpp
index f2a0fb5aa9..f6ffe36693 100644
--- a/kernel/kernel/Device/FramebufferDevice.cpp
+++ b/kernel/kernel/Device/FramebufferDevice.cpp
@@ -240,7 +240,7 @@ namespace Kernel
 				return BAN::Error::from_errno(ENOMEM);
 			auto region = BAN::UniqPtr<FramebufferMemoryRegion>::adopt(region_ptr);
 
-			TRY(region->initialize({ m_vaddr, m_vaddr + BAN::Math::div_round_up(m_size, PAGE_SIZE) * PAGE_SIZE }));
+			TRY(region->initialize({ m_vaddr, m_vaddr + BAN::Math::div_round_up<uintptr_t>(m_size, PAGE_SIZE) * PAGE_SIZE }));
 
 			return BAN::UniqPtr<MemoryRegion>(BAN::move(region));
 		}
diff --git a/kernel/kernel/Storage/NVMe/Namespace.cpp b/kernel/kernel/Storage/NVMe/Namespace.cpp
index ca494ed12c..866b656652 100644
--- a/kernel/kernel/Storage/NVMe/Namespace.cpp
+++ b/kernel/kernel/Storage/NVMe/Namespace.cpp
@@ -63,7 +63,7 @@ namespace Kernel
 
 		for (uint64_t i = 0; i < sector_count;)
 		{
-			uint16_t count = BAN::Math::min(sector_count - i, m_dma_region->size() / m_block_size);
+			uint16_t count = BAN::Math::min<uint64_t>(sector_count - i, m_dma_region->size() / m_block_size);
 
 			NVMe::SubmissionQueueEntry sqe {};
 			sqe.opc = NVMe::OPC_IO_READ;
@@ -90,7 +90,7 @@ namespace Kernel
 
 		for (uint64_t i = 0; i < sector_count;)
 		{
-			uint16_t count = BAN::Math::min(sector_count - i, m_dma_region->size() / m_block_size);
+			uint16_t count = BAN::Math::min<uint16_t>(sector_count - i, m_dma_region->size() / m_block_size);
 
 			memcpy(reinterpret_cast<void*>(m_dma_region->vaddr()), buffer.data() + i * m_block_size, count * m_block_size);