diff --git a/layer/layer.cpp b/layer/layer.cpp
index 003bf66..d2cb34f 100644
--- a/layer/layer.cpp
+++ b/layer/layer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2019 Arm Limited.
+ * Copyright (c) 2016-2020 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -59,7 +59,7 @@ VKAPI_ATTR VkResult extension_properties(const uint32_t count, const VkExtension
    }
 
    size = *pCount < count ? *pCount : count;
-   memcpy(pProp, layer_ext, size * sizeof(VkLayerProperties));
+   memcpy(pProp, layer_ext, size * sizeof(VkExtensionProperties));
    *pCount = size;
    if (size < count)
    {
@@ -195,6 +195,10 @@ extern "C"
    VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL
    wsi_layer_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator)
    {
+      assert(instance);
+      layer::instance_private_data::get(layer::get_key(instance))
+      .disp.DestroyInstance(instance, pAllocator);
+
       layer::instance_private_data::destroy(instance);
    }
 
diff --git a/layer/private_data.hpp b/layer/private_data.hpp
index 44ad5b6..8d15e0b 100644
--- a/layer/private_data.hpp
+++ b/layer/private_data.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019 Arm Limited.
+ * Copyright (c) 2018-2020 Arm Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -37,6 +37,7 @@
    V(GetPhysicalDeviceSurfaceCapabilitiesKHR) \
    V(GetPhysicalDeviceSurfaceFormatsKHR)      \
    V(GetPhysicalDeviceSurfacePresentModesKHR) \
+   V(DestroyInstance)                         \
    V(GetPhysicalDeviceSurfaceSupportKHR)
 
 namespace layer