diff --git a/README.md b/README.md
index d62835f..37ff2b0 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,7 @@ git clone https://github.com/KhronosGroup/Vulkan-Loader.git
 mkdir Vulkan-Loader/build
 cd Vulkan-Loader/build
 ../scripts/update_deps.py
-make -C Vulkan-Headers install
-cmake -C helper.cmake .. -DBUILD_WSI_HEADLESS_SUPPORT=ON
+cmake -C helper.cmake ..
 make
 make install
 ```
diff --git a/layer/private_data.cpp b/layer/private_data.cpp
index 4d15769..8396a94 100644
--- a/layer/private_data.cpp
+++ b/layer/private_data.cpp
@@ -88,6 +88,7 @@ device_private_data &device_private_data::create(VkDevice dev, PFN_vkGetDevicePr
       new device_private_data(dev, get_proc, instance_private_data::get(get_key(phys_dev)), set_loader_data);
    scoped_mutex lock(g_data_lock);
    g_device_data[get_key(dev)] = dev_data;
+   return *dev_data;
 }
 
 device_private_data &device_private_data::get(void *key)