diff --git a/src/xrt/compositor/client/comp_gl_client.c b/src/xrt/compositor/client/comp_gl_client.c
index 170e78f3a..79024d276 100644
--- a/src/xrt/compositor/client/comp_gl_client.c
+++ b/src/xrt/compositor/client/comp_gl_client.c
@@ -17,6 +17,7 @@
 #include "ogl/ogl_api.h"
 #include "client/comp_gl_client.h"
 
+#include <inttypes.h>
 
 /*
  *
@@ -169,7 +170,9 @@ vk_format_to_gl(int64_t format)
 	case 44 /*VK_FORMAT_B8G8R8A8_UNORM*/: return 0;
 	case 50 /*VK_FORMAT_B8G8R8A8_SRGB*/: return 0;
 	default:
-		printf("Cannot convert VK format %ld to GL format!\n", format);
+		printf("Cannot convert VK format 0x%016" PRIx64
+		       " to GL format!\n",
+		       format);
 		return 0;
 	}
 }
diff --git a/src/xrt/compositor/main/comp_swapchain.c b/src/xrt/compositor/main/comp_swapchain.c
index 332350679..f866165f9 100644
--- a/src/xrt/compositor/main/comp_swapchain.c
+++ b/src/xrt/compositor/main/comp_swapchain.c
@@ -95,7 +95,7 @@ create_image_fd(struct comp_compositor *c,
 	VkDeviceMemory device_memory = VK_NULL_HANDLE;
 	VkImage image = VK_NULL_HANDLE;
 	VkResult ret = VK_SUCCESS;
-	size_t size;
+	VkDeviceSize size;
 	int fd;
 
 	COMP_SPEW(c, "->image - vkCreateImage %dx%d", width, height);