diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index 94bff30..3d42329 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -6970,14 +6970,14 @@ int main( int argc, char ** argv )
     }
 
     template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
-    operator std::string const () const VULKAN_HPP_NOEXCEPT
+    operator std::string() const
     {
       return std::string( this->data() );
     }
 
 #if 17 <= VULKAN_HPP_CPP_VERSION
     template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
-    operator std::string_view const () const VULKAN_HPP_NOEXCEPT
+    operator std::string_view() const
     {
       return std::string_view( this->data() );
     }
diff --git a/samples/InstanceLayerExtensionProperties/InstanceLayerExtensionProperties.cpp b/samples/InstanceLayerExtensionProperties/InstanceLayerExtensionProperties.cpp
index 3e3bf6c..1bf4e3e 100644
--- a/samples/InstanceLayerExtensionProperties/InstanceLayerExtensionProperties.cpp
+++ b/samples/InstanceLayerExtensionProperties/InstanceLayerExtensionProperties.cpp
@@ -49,7 +49,7 @@ int main( int /*argc*/, char ** /*argv*/ )
     for ( auto const & layerProperty : layerProperties )
     {
       std::vector<vk::ExtensionProperties> extensionProperties =
-        vk::enumerateInstanceExtensionProperties( std::string( layerProperty.layerName ) );
+        vk::enumerateInstanceExtensionProperties( vk::Optional<const std::string>( layerProperty.layerName ) );
       propertyData.push_back( PropertyData( layerProperty, extensionProperties ) );
     }
 
diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
index 38b21ce..ae0e9c6 100644
--- a/vulkan/vulkan.hpp
+++ b/vulkan/vulkan.hpp
@@ -379,14 +379,14 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
-    operator std::string const() const VULKAN_HPP_NOEXCEPT
+    operator std::string() const
     {
       return std::string( this->data() );
     }
 
 #if 17 <= VULKAN_HPP_CPP_VERSION
     template <typename B = T, typename std::enable_if<std::is_same<B, char>::value, int>::type = 0>
-    operator std::string_view const() const VULKAN_HPP_NOEXCEPT
+    operator std::string_view() const
     {
       return std::string_view( this->data() );
     }