diff --git a/src/xrt/compositor/common/comp_vk.c b/src/xrt/compositor/common/comp_vk.c
index f9ce1b845..0ad488760 100644
--- a/src/xrt/compositor/common/comp_vk.c
+++ b/src/xrt/compositor/common/comp_vk.c
@@ -243,7 +243,7 @@ vk_create_image_from_fd(struct vk_bundle *vk,
                         VkDeviceMemory *out_mem)
 {
 	VkMemoryRequirements memory_requirements;
-	VkImageUsageFlagBits image_usage = 0;
+	VkImageUsageFlags image_usage = (VkImageUsageFlags)0;
 	VkDeviceMemory device_memory = NULL;
 	uint32_t memory_type_index = UINT32_MAX;
 	VkImage image = NULL;
@@ -262,7 +262,7 @@ vk_create_image_from_fd(struct vk_bundle *vk,
 	    .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
 	    .pNext = &external_memory_image_create_info,
 	    .imageType = VK_IMAGE_TYPE_2D,
-	    .format = format,
+	    .format = (VkFormat)format,
 	    .extent = {.width = width, .height = height, .depth = 1},
 	    .mipLevels = mip_count,
 	    .arrayLayers = 1,
@@ -594,7 +594,7 @@ vk_init_cmd_pool(struct vk_bundle *vk)
 	case r: return #r
 
 static const char *
-vk_debug_report_string(VkDebugReportFlagBitsEXT code)
+vk_debug_report_string(VkDebugReportFlagsEXT code)
 {
 	switch (code) {
 		ENUM_TO_STR(VK_DEBUG_REPORT_INFORMATION_BIT_EXT);
diff --git a/src/xrt/compositor/main/comp_swapchain.c b/src/xrt/compositor/main/comp_swapchain.c
index 523efcaf1..e2fcf3d7b 100644
--- a/src/xrt/compositor/main/comp_swapchain.c
+++ b/src/xrt/compositor/main/comp_swapchain.c
@@ -69,7 +69,7 @@ create_image_fd(struct comp_compositor *c,
                 struct xrt_image_fd *out_image_fd)
 {
 	VkMemoryRequirements memory_requirements;
-	VkImageUsageFlagBits image_usage = 0;
+	VkImageUsageFlags image_usage = (VkImageUsageFlags)0;
 	VkDeviceMemory device_memory = NULL;
 	uint32_t memory_type_index = UINT32_MAX;
 	VkImage image = NULL;
@@ -97,7 +97,7 @@ create_image_fd(struct comp_compositor *c,
 	    .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
 	    .pNext = &external_memory_image_create_info,
 	    .imageType = VK_IMAGE_TYPE_2D,
-	    .format = format,
+	    .format = (VkFormat)format,
 	    .extent = {.width = width, .height = height, .depth = 1},
 	    .mipLevels = mip_count,
 	    .arrayLayers = 1,
@@ -242,8 +242,7 @@ comp_swapchain_create(struct xrt_compositor *xc,
 		}
 
 		vk_create_sampler(&c->vk, &sc->images[i].sampler);
-
-		vk_create_view(&c->vk, sc->images[i].image, format,
+		vk_create_view(&c->vk, sc->images[i].image, (VkFormat)format,
 		               &sc->images[i].view);
 	}