diff --git a/driver/command.c b/driver/command.c
index f1398c0..f112961 100644
--- a/driver/command.c
+++ b/driver/command.c
@@ -840,5 +840,5 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdSetDeviceMask(
 	VkCommandBuffer                             commandBuffer,
 	uint32_t                                    deviceMask)
 {
-	UNSUPPORTED(rpi_vkCmdSetDeviceMask);
+	UNSUPPORTED(vkCmdSetDeviceMask);
 }
diff --git a/driver/common.c b/driver/common.c
index 43aeef3..cecb156 100644
--- a/driver/common.c
+++ b/driver/common.c
@@ -986,7 +986,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkGetPhysicalDeviceExternalBufferProperties(
 	const VkPhysicalDeviceExternalBufferInfo*   pExternalBufferInfo,
 	VkExternalBufferProperties*                 pExternalBufferProperties)
 {
-	UNSUPPORTED(rpi_vkGetPhysicalDeviceExternalBufferProperties);
+	UNSUPPORTED(vkGetPhysicalDeviceExternalBufferProperties);
 }
 
 VKAPI_ATTR void VKAPI_CALL rpi_vkGetPhysicalDeviceExternalFenceProperties(
@@ -994,7 +994,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkGetPhysicalDeviceExternalFenceProperties(
 	const VkPhysicalDeviceExternalFenceInfo*    pExternalFenceInfo,
 	VkExternalFenceProperties*                  pExternalFenceProperties)
 {
-	UNSUPPORTED(rpi_vkGetPhysicalDeviceExternalFenceProperties);
+	UNSUPPORTED(vkGetPhysicalDeviceExternalFenceProperties);
 }
 
 
@@ -1003,7 +1003,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkGetPhysicalDeviceExternalSemaphoreProperties(
 	const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo,
 	VkExternalSemaphoreProperties*              pExternalSemaphoreProperties)
 {
-	UNSUPPORTED(rpi_vkGetPhysicalDeviceExternalSemaphoreProperties);
+	UNSUPPORTED(vkGetPhysicalDeviceExternalSemaphoreProperties);
 }
 
 VKAPI_ATTR void VKAPI_CALL rpi_vkGetDeviceGroupPeerMemoryFeatures(
@@ -1013,5 +1013,5 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkGetDeviceGroupPeerMemoryFeatures(
 	uint32_t                                    remoteDeviceIndex,
 	VkPeerMemoryFeatureFlags*                   pPeerMemoryFeatures)
 {
-	UNSUPPORTED(rpi_vkGetDeviceGroupPeerMemoryFeatures);
+	UNSUPPORTED(vkGetDeviceGroupPeerMemoryFeatures);
 }
diff --git a/driver/compute.c b/driver/compute.c
index 7f6bf17..e6cf7ae 100644
--- a/driver/compute.c
+++ b/driver/compute.c
@@ -11,7 +11,7 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkCreateComputePipelines(
 	const VkAllocationCallbacks*                pAllocator,
 	VkPipeline*                                 pPipelines)
 {
-	UNSUPPORTED(rpi_vkCreateComputePipelines);
+	UNSUPPORTED(vkCreateComputePipelines);
 	return UNSUPPORTED_RETURN;
 }
 
@@ -20,7 +20,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdDispatchIndirect(
 	VkBuffer                                    buffer,
 	VkDeviceSize                                offset)
 {
-	UNSUPPORTED(rpi_vkCmdDispatchIndirect);
+	UNSUPPORTED(vkCmdDispatchIndirect);
 }
 
 VKAPI_ATTR void VKAPI_CALL rpi_vkCmdDispatch(
@@ -29,7 +29,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdDispatch(
 	uint32_t                                    groupCountY,
 	uint32_t                                    groupCountZ)
 {
-	UNSUPPORTED(rpi_vkCmdDispatch);
+	UNSUPPORTED(vkCmdDispatch);
 }
 
 VKAPI_ATTR void VKAPI_CALL rpi_vkCmdDispatchBase(
@@ -41,5 +41,5 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdDispatchBase(
 	uint32_t                                    groupCountY,
 	uint32_t                                    groupCountZ)
 {
-	UNSUPPORTED(rpi_vkCmdDispatchBase);
+	UNSUPPORTED(vkCmdDispatchBase);
 }
diff --git a/driver/draw.c b/driver/draw.c
index 8aaa588..3013f1b 100644
--- a/driver/draw.c
+++ b/driver/draw.c
@@ -482,7 +482,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdDrawIndexedIndirect(
 	uint32_t                                    drawCount,
 	uint32_t                                    stride)
 {
-	UNSUPPORTED(rpi_vkCmdDrawIndexedIndirect);
+	UNSUPPORTED(vkCmdDrawIndexedIndirect);
 }
 
 VKAPI_ATTR void VKAPI_CALL rpi_vkCmdDrawIndirect(
@@ -492,5 +492,5 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdDrawIndirect(
 	uint32_t                                    drawCount,
 	uint32_t                                    stride)
 {
-	UNSUPPORTED(rpi_vkCmdDrawIndirect);
+	UNSUPPORTED(vkCmdDrawIndirect);
 }
diff --git a/driver/memory.c b/driver/memory.c
index c13ab72..11827a3 100644
--- a/driver/memory.c
+++ b/driver/memory.c
@@ -106,6 +106,9 @@ VkResult rpi_vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize of
 	{
 		assert(size > 0);
 		assert(size <= ((_deviceMemory*)memory)->size - offset);
+	}else
+	{
+		size = ((_deviceMemory*)memory)->size;
 	}
 
 	//TODO check ppdata alignment
diff --git a/driver/pipeline.c b/driver/pipeline.c
index 6b970fc..0d09f73 100644
--- a/driver/pipeline.c
+++ b/driver/pipeline.c
@@ -402,7 +402,7 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkMergePipelineCaches(
 	uint32_t                                    srcCacheCount,
 	const VkPipelineCache*                      pSrcCaches)
 {
-	UNSUPPORTED(rpi_vkMergePipelineCaches);
+	UNSUPPORTED(vkMergePipelineCaches);
 	return UNSUPPORTED_RETURN;
 }
 
@@ -412,7 +412,7 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkGetPipelineCacheData(
 	size_t*                                     pDataSize,
 	void*                                       pData)
 {
-	UNSUPPORTED(rpi_vkGetPipelineCacheData);
+	UNSUPPORTED(vkGetPipelineCacheData);
 	return UNSUPPORTED_RETURN;
 }
 
@@ -421,7 +421,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkDestroyPipelineCache(
 	VkPipelineCache                             pipelineCache,
 	const VkAllocationCallbacks*                pAllocator)
 {
-	UNSUPPORTED(rpi_vkDestroyPipelineCache);
+	UNSUPPORTED(vkDestroyPipelineCache);
 }
 
 VKAPI_ATTR VkResult VKAPI_CALL rpi_vkCreatePipelineLayout(
@@ -487,6 +487,6 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkCreatePipelineCache(
 	const VkAllocationCallbacks*                pAllocator,
 	VkPipelineCache*                            pPipelineCache)
 {
-	UNSUPPORTED(rpi_vkCreatePipelineCache);
+	UNSUPPORTED(vkCreatePipelineCache);
 	return UNSUPPORTED_RETURN;
 }
diff --git a/driver/shader.c b/driver/shader.c
index 7594122..f57a4e2 100644
--- a/driver/shader.c
+++ b/driver/shader.c
@@ -11,7 +11,7 @@
  */
 VkResult rpi_vkCreateShaderModule(VkDevice device, const VkShaderModuleCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkShaderModule* pShaderModule)
 {
-	UNSUPPORTED(rpi_vkCreateShaderModule);
+	UNSUPPORTED(vkCreateShaderModule);
 	return UNSUPPORTED_RETURN;
 }
 
diff --git a/driver/sparse.c b/driver/sparse.c
index f8da446..7656ee4 100644
--- a/driver/sparse.c
+++ b/driver/sparse.c
@@ -10,7 +10,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkGetPhysicalDeviceSparseImageFormatProperties(
 	uint32_t*                                   pPropertyCount,
 		VkSparseImageFormatProperties*              pProperties)
 {
-	UNSUPPORTED(rpi_vkGetPhysicalDeviceSparseImageFormatProperties);
+	UNSUPPORTED(vkGetPhysicalDeviceSparseImageFormatProperties);
 }
 
 VKAPI_ATTR void VKAPI_CALL rpi_vkGetImageSparseMemoryRequirements(
@@ -19,7 +19,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkGetImageSparseMemoryRequirements(
 	uint32_t*                                   pSparseMemoryRequirementCount,
 	VkSparseImageMemoryRequirements*            pSparseMemoryRequirements)
 {
-	UNSUPPORTED(rpi_vkGetImageSparseMemoryRequirements);
+	UNSUPPORTED(vkGetImageSparseMemoryRequirements);
 }
 
 VKAPI_ATTR VkResult VKAPI_CALL rpi_vkQueueBindSparse(
@@ -28,7 +28,7 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkQueueBindSparse(
 	const VkBindSparseInfo*                     pBindInfo,
 	VkFence                                     fence)
 {
-	UNSUPPORTED(rpi_vkQueueBindSparse);
+	UNSUPPORTED(vkQueueBindSparse);
 	return UNSUPPORTED_RETURN;
 }
 
@@ -38,7 +38,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkGetPhysicalDeviceSparseImageFormatProperties2(
 	uint32_t*                                   pPropertyCount,
 	VkSparseImageFormatProperties2*             pProperties)
 {
-	UNSUPPORTED(rpi_vkGetPhysicalDeviceSparseImageFormatProperties2);
+	UNSUPPORTED(vkGetPhysicalDeviceSparseImageFormatProperties2);
 }
 
 VKAPI_ATTR void VKAPI_CALL rpi_vkGetImageSparseMemoryRequirements2(
@@ -47,5 +47,5 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkGetImageSparseMemoryRequirements2(
 	uint32_t*                                   pSparseMemoryRequirementCount,
 	VkSparseImageMemoryRequirements2*           pSparseMemoryRequirements)
 {
-	UNSUPPORTED(rpi_vkGetImageSparseMemoryRequirements2);
+	UNSUPPORTED(vkGetImageSparseMemoryRequirements2);
 }
diff --git a/driver/sync.c b/driver/sync.c
index fd6c86f..0b68e68 100644
--- a/driver/sync.c
+++ b/driver/sync.c
@@ -435,14 +435,14 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdWaitEvents(
 	uint32_t                                    imageMemoryBarrierCount,
 	const VkImageMemoryBarrier*                 pImageMemoryBarriers)
 {
-	UNSUPPORTED(rpi_vkCmdWaitEvents);
+	UNSUPPORTED(vkCmdWaitEvents);
 }
 
 VKAPI_ATTR VkResult VKAPI_CALL rpi_vkGetEventStatus(
 	VkDevice                                    device,
 	VkEvent                                     event)
 {
-	UNSUPPORTED(rpi_vkGetEventStatus);
+	UNSUPPORTED(vkGetEventStatus);
 	return UNSUPPORTED_RETURN;
 }
 
@@ -451,7 +451,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkDestroyEvent(
 	VkEvent                                     event,
 	const VkAllocationCallbacks*                pAllocator)
 {
-	UNSUPPORTED(rpi_vkDestroyEvent);
+	UNSUPPORTED(vkDestroyEvent);
 }
 
 VKAPI_ATTR void VKAPI_CALL rpi_vkCmdResetEvent(
@@ -459,7 +459,7 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdResetEvent(
 	VkEvent                                     event,
 	VkPipelineStageFlags                        stageMask)
 {
-	UNSUPPORTED(rpi_vkCmdResetEvent);
+	UNSUPPORTED(vkCmdResetEvent);
 }
 
 VKAPI_ATTR VkResult VKAPI_CALL rpi_vkCreateEvent(
@@ -468,7 +468,7 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkCreateEvent(
 	const VkAllocationCallbacks*                pAllocator,
 	VkEvent*                                    pEvent)
 {
-	UNSUPPORTED(rpi_vkCreateEvent);
+	UNSUPPORTED(vkCreateEvent);
 	return UNSUPPORTED_RETURN;
 }
 
@@ -476,7 +476,7 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkResetEvent(
 	VkDevice                                    device,
 	VkEvent                                     event)
 {
-	UNSUPPORTED(rpi_vkResetEvent);
+	UNSUPPORTED(vkResetEvent);
 	return UNSUPPORTED_RETURN;
 }
 
@@ -484,7 +484,7 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkSetEvent(
 	VkDevice                                    device,
 	VkEvent                                     event)
 {
-	UNSUPPORTED(rpi_vkSetEvent);
+	UNSUPPORTED(vkSetEvent);
 	return UNSUPPORTED_RETURN;
 }
 
@@ -493,5 +493,5 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdSetEvent(
 	VkEvent                                     event,
 	VkPipelineStageFlags                        stageMask)
 {
-	UNSUPPORTED(rpi_vkCmdSetEvent);
+	UNSUPPORTED(vkCmdSetEvent);
 }