diff --git a/languages/cpp/templates/callback-initialization/tuple.cpp b/languages/cpp/templates/callback-initialization/tuple.cpp
new file mode 100644
index 00000000..754b0fed
--- /dev/null
+++ b/languages/cpp/templates/callback-initialization/tuple.cpp
@@ -0,0 +1 @@
+            ${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}${title} ${property};
\ No newline at end of file
diff --git a/languages/cpp/templates/callback-result-instantiation/sub-property/array.cpp b/languages/cpp/templates/callback-result-instantiation/sub-property/array.cpp
index c9775b99..bb379cb8 100644
--- a/languages/cpp/templates/callback-result-instantiation/sub-property/array.cpp
+++ b/languages/cpp/templates/callback-result-instantiation/sub-property/array.cpp
@@ -6,5 +6,5 @@
                 }
             }${end.if.optional}${if.non.optional}auto index((*proxyResponse)${Property.dependency}.${Property}.Elements());
             while (index.Next() == true) {
-${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property}.value().push_back(index.Current().Value());${end.if.non.object}
+${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property}.push_back(index.Current().Value());${end.if.non.object}
             }${end.if.non.optional}
diff --git a/languages/cpp/templates/sdk/scripts/install.sh b/languages/cpp/templates/sdk/scripts/install.sh
index b31556a2..6e504a14 100755
--- a/languages/cpp/templates/sdk/scripts/install.sh
+++ b/languages/cpp/templates/sdk/scripts/install.sh
@@ -40,8 +40,8 @@ GetVersion()
   Version=${array[2]}
 }
 
-Version=0.0
-GetVersion
+Version=1.3.0-next.1
+#GetVersion
 ReleaseName=firebolt-${ModuleName}-native-sdk-${Version}
 ReleasePath=${InstallPath}/${ReleaseName}
 
diff --git a/src/macrofier/types.mjs b/src/macrofier/types.mjs
index e9ef0c3e..452ebd43 100644
--- a/src/macrofier/types.mjs
+++ b/src/macrofier/types.mjs
@@ -360,7 +360,7 @@ const insertObjectMacros = (content, schema, module, title, property, options) =
           .replace(/\$\{if\.base\.optional\}(.*?)\$\{end\.if\.base\.optional\}/gms, options.required ? '' : '$1')
           .replace(/\$\{if\.non\.object\}(.*?)\$\{end\.if\.non\.object\}/gms, isObject(localizedProp) ? '' : '$1')
           .replace(/\$\{if\.non\.array\}(.*?)\$\{end\.if\.non\.array\}/gms, (localizedProp.type === 'array') ? '' : '$1')
-          .replace(/\$\{if\.non\.anyOf\}(.*?)\$\{end\.if\.non\.anyOf\}/gms, (localizedProp.anyOf || localizedProp.anyOneOf) ? '' : '$1')
+          .replace(/\$\{if\.non\.anyOf\}(.*?)\$\{end\.if\.non\.anyOf\}/gms, (localizedProp.anyOf || localizedProp.oneOf) ? '' : '$1')
           .replace(/\$\{if\.non\.const\}(.*?)\$\{end\.if\.non\.const\}/gms, (typeof localizedProp.const === 'string') ? '' : '$1')
           let baseTitle = options.property