diff --git a/.appveyor.yml b/.appveyor.yml
index 3daa020..2a9f276 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -70,6 +70,7 @@ build_script:
     -DSAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON 
     -DTESTS_BUILD_ONLY_DYNAMIC=ON 
     -DTESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON
+    -DVULKAN_HPP_RUN_GENERATOR=ON
     -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
     -DCMAKE_CXX_STANDARD=%CXX_STANDARD%
-  - cmake --build . --config %CONFIGURATION%
+  - cmake --build . --config %BUILD_TYPE%
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2557880..73dad95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ endif()
 if (NOT DEFINED CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 11)
 endif()
-set(CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 message("CMAKE_CXX_STANDARD = <${CMAKE_CXX_STANDARD}>")
 
diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index fb3054f..35ece19 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -2518,8 +2518,12 @@ bool VulkanHppGenerator::appendCommandVoid2Return( std::string &               s
 
 void VulkanHppGenerator::appendDestroyCommand( std::string &       str,
                                                std::string const & name,
-                                               CommandData const & commandData,
-                                               std::string const & handleName ) const
+                                               CommandData const & commandData
+#if !defined( NDEBUG )
+                                               ,
+                                               std::string const & handleName
+#endif
+) const
 {
   // special handling for destroy functions, filter out alias functions
   std::string commandName = determineCommandName( name, commandData.params[0].type.type, m_tags );
@@ -3178,7 +3182,14 @@ void VulkanHppGenerator::appendHandle( std::string & str, std::pair<std::string,
 
           commands += "\n";
           appendCommand( commands, commandIt->first, commandIt->second, 1, false );
-          appendDestroyCommand( commands, commandIt->first, commandIt->second, handleData.first );
+          appendDestroyCommand( commands,
+                                commandIt->first,
+                                commandIt->second
+#if !defined( NDEBUG )
+                                ,
+                                handleData.first
+#endif
+          );
         }
       }
     }
@@ -3201,7 +3212,14 @@ void VulkanHppGenerator::appendHandle( std::string & str, std::pair<std::string,
             determineCommandName( commandIt->first, commandIt->second.params[0].type.type, m_tags );
           commands += "\n";
           appendCommand( commands, commandIt->first, commandIt->second, 1, false );
-          appendDestroyCommand( commands, commandIt->first, commandIt->second, handleData.first );
+          appendDestroyCommand( commands,
+                                commandIt->first,
+                                commandIt->second
+#if !defined( NDEBUG )
+                                ,
+                                handleData.first
+#endif
+          );
         }
         commands += leave;
       }
diff --git a/VulkanHppGenerator.hpp b/VulkanHppGenerator.hpp
index 9a547b4..3adae54 100644
--- a/VulkanHppGenerator.hpp
+++ b/VulkanHppGenerator.hpp
@@ -401,102 +401,106 @@ private:
                                          std::map<size_t, size_t> const & vectorParamIndices,
                                          std::vector<size_t> const &      nonConstPointerParamIndices ) const;
   void
-              appendCommandStandardEnhancedDeprecatedAllocator( std::string &                    str,
-                                                                std::string const &              name,
-                                                                CommandData const &              commandData,
-                                                                size_t                           initialSkipCount,
-                                                                bool                             definition,
-                                                                std::map<size_t, size_t> const & vectorParamIndices,
-                                                                std::vector<size_t> const & nonConstPointerParamIndices ) const;
-  void        appendCommandStandardOrEnhanced( std::string &       str,
-                                               std::string const & name,
-                                               CommandData const & commandData,
-                                               size_t              initialSkipCount,
-                                               bool                definition ) const;
-  void        appendCommandUnique( std::string &       str,
-                                   std::string const & name,
-                                   CommandData const & commandData,
-                                   size_t              initialSkipCount,
-                                   size_t              nonConstPointerIndex,
-                                   bool                definition ) const;
-  bool        appendCommandValue( std::string &       str,
-                                  std::string const & name,
-                                  CommandData const & commandData,
-                                  size_t              initialSkipCount,
-                                  bool                definition ) const;
-  bool        appendCommandValue0Return( std::string &       str,
-                                         std::string const & name,
-                                         CommandData const & commandData,
-                                         size_t              initialSkipCount,
-                                         bool                definition ) const;
-  void        appendCommandVector( std::string &                     str,
-                                   std::string const &               name,
-                                   CommandData const &               commandData,
-                                   size_t                            initialSkipCount,
-                                   bool                              definition,
-                                   std::pair<size_t, size_t> const & vectorParamIndex,
-                                   std::vector<size_t> const &       returnParamIndices ) const;
-  void        appendCommandVectorChained( std::string &                    str,
-                                          std::string const &              name,
-                                          CommandData const &              commandData,
-                                          size_t                           initialSkipCount,
-                                          bool                             definition,
-                                          std::map<size_t, size_t> const & vectorParamIndices,
-                                          std::vector<size_t> const &      returnParamIndices ) const;
-  void        appendCommandVectorDeprecated( std::string &                    str,
-                                             std::string const &              name,
-                                             CommandData const &              commandData,
-                                             size_t                           initialSkipCount,
-                                             std::map<size_t, size_t> const & vectorParamIndices,
-                                             std::vector<size_t> const &      returnParamIndices,
-                                             bool                             definition ) const;
-  void        appendCommandVectorSingular( std::string &                    str,
-                                           std::string const &              name,
-                                           CommandData const &              commandData,
-                                           size_t                           initialSkipCount,
-                                           std::map<size_t, size_t> const & vectorParamIndices,
-                                           size_t                           returnParamIndex,
-                                           bool                             definition ) const;
-  void        appendCommandVectorSingularUnique( std::string &                    str,
-                                                 std::string const &              name,
-                                                 CommandData const &              commandData,
-                                                 size_t                           initialSkipCount,
-                                                 std::map<size_t, size_t> const & vectorParamIndices,
-                                                 size_t                           returnParamIndex,
-                                                 bool                             definition ) const;
-  void        appendCommandVectorUnique( std::string &                    str,
-                                         std::string const &              name,
-                                         CommandData const &              commandData,
-                                         size_t                           initialSkipCount,
-                                         std::map<size_t, size_t> const & vectorParamIndices,
-                                         size_t                           returnParamIndex,
-                                         bool                             definition ) const;
-  bool        appendCommandVoid( std::string &       str,
-                                 std::string const & name,
-                                 CommandData const & commandData,
-                                 size_t              initialSkipCount,
-                                 bool                definition ) const;
-  bool        appendCommandVoid0Return( std::string &       str,
+       appendCommandStandardEnhancedDeprecatedAllocator( std::string &                    str,
+                                                         std::string const &              name,
+                                                         CommandData const &              commandData,
+                                                         size_t                           initialSkipCount,
+                                                         bool                             definition,
+                                                         std::map<size_t, size_t> const & vectorParamIndices,
+                                                         std::vector<size_t> const & nonConstPointerParamIndices ) const;
+  void appendCommandStandardOrEnhanced( std::string &       str,
                                         std::string const & name,
                                         CommandData const & commandData,
                                         size_t              initialSkipCount,
                                         bool                definition ) const;
-  bool        appendCommandVoid1Return( std::string &       str,
-                                        std::string const & name,
-                                        CommandData const & commandData,
-                                        size_t              initialSkipCount,
-                                        bool                definition,
-                                        size_t              returnParamIndex ) const;
-  bool        appendCommandVoid2Return( std::string &               str,
-                                        std::string const &         name,
-                                        CommandData const &         commandData,
-                                        size_t                      initialSkipCount,
-                                        bool                        definition,
-                                        std::vector<size_t> const & returnParamIndices ) const;
-  void        appendDestroyCommand( std::string &       str,
-                                    std::string const & name,
-                                    CommandData const & commandData,
-                                    std::string const & handleName ) const;
+  void appendCommandUnique( std::string &       str,
+                            std::string const & name,
+                            CommandData const & commandData,
+                            size_t              initialSkipCount,
+                            size_t              nonConstPointerIndex,
+                            bool                definition ) const;
+  bool appendCommandValue( std::string &       str,
+                           std::string const & name,
+                           CommandData const & commandData,
+                           size_t              initialSkipCount,
+                           bool                definition ) const;
+  bool appendCommandValue0Return( std::string &       str,
+                                  std::string const & name,
+                                  CommandData const & commandData,
+                                  size_t              initialSkipCount,
+                                  bool                definition ) const;
+  void appendCommandVector( std::string &                     str,
+                            std::string const &               name,
+                            CommandData const &               commandData,
+                            size_t                            initialSkipCount,
+                            bool                              definition,
+                            std::pair<size_t, size_t> const & vectorParamIndex,
+                            std::vector<size_t> const &       returnParamIndices ) const;
+  void appendCommandVectorChained( std::string &                    str,
+                                   std::string const &              name,
+                                   CommandData const &              commandData,
+                                   size_t                           initialSkipCount,
+                                   bool                             definition,
+                                   std::map<size_t, size_t> const & vectorParamIndices,
+                                   std::vector<size_t> const &      returnParamIndices ) const;
+  void appendCommandVectorDeprecated( std::string &                    str,
+                                      std::string const &              name,
+                                      CommandData const &              commandData,
+                                      size_t                           initialSkipCount,
+                                      std::map<size_t, size_t> const & vectorParamIndices,
+                                      std::vector<size_t> const &      returnParamIndices,
+                                      bool                             definition ) const;
+  void appendCommandVectorSingular( std::string &                    str,
+                                    std::string const &              name,
+                                    CommandData const &              commandData,
+                                    size_t                           initialSkipCount,
+                                    std::map<size_t, size_t> const & vectorParamIndices,
+                                    size_t                           returnParamIndex,
+                                    bool                             definition ) const;
+  void appendCommandVectorSingularUnique( std::string &                    str,
+                                          std::string const &              name,
+                                          CommandData const &              commandData,
+                                          size_t                           initialSkipCount,
+                                          std::map<size_t, size_t> const & vectorParamIndices,
+                                          size_t                           returnParamIndex,
+                                          bool                             definition ) const;
+  void appendCommandVectorUnique( std::string &                    str,
+                                  std::string const &              name,
+                                  CommandData const &              commandData,
+                                  size_t                           initialSkipCount,
+                                  std::map<size_t, size_t> const & vectorParamIndices,
+                                  size_t                           returnParamIndex,
+                                  bool                             definition ) const;
+  bool appendCommandVoid( std::string &       str,
+                          std::string const & name,
+                          CommandData const & commandData,
+                          size_t              initialSkipCount,
+                          bool                definition ) const;
+  bool appendCommandVoid0Return( std::string &       str,
+                                 std::string const & name,
+                                 CommandData const & commandData,
+                                 size_t              initialSkipCount,
+                                 bool                definition ) const;
+  bool appendCommandVoid1Return( std::string &       str,
+                                 std::string const & name,
+                                 CommandData const & commandData,
+                                 size_t              initialSkipCount,
+                                 bool                definition,
+                                 size_t              returnParamIndex ) const;
+  bool appendCommandVoid2Return( std::string &               str,
+                                 std::string const &         name,
+                                 CommandData const &         commandData,
+                                 size_t                      initialSkipCount,
+                                 bool                        definition,
+                                 std::vector<size_t> const & returnParamIndices ) const;
+  void appendDestroyCommand( std::string &       str,
+                             std::string const & name,
+                             CommandData const & commandData
+#if !defined( NDEBUG )
+                             ,
+                             std::string const & handleName
+#endif
+  ) const;
   void        appendDispatchLoaderDynamicCommand( std::string &       str,
                                                   std::string &       emptyFunctions,
                                                   std::string &       deviceFunctions,