diff --git a/collada/cpp_header.py b/collada/cpp_header.py
index a1134c6..600d1ed 100644
--- a/collada/cpp_header.py
+++ b/collada/cpp_header.py
@@ -298,8 +298,8 @@ def render_light(light_name, light_type, color):
     yield f".color = {{ {render_float_tuple(color)} }},"
     yield "};"
 
-def render_image(image_id, image_name, resource_name):
-    yield f"// {image.id}"
+def render_image(image_id, image_name, resource_name, uri):
+    yield f"// {image_id}"
     yield f"image const image_{image_name} = {{"
     yield f'.resource_name = L"{resource_name}",'
     yield "};"
diff --git a/collada/header.py b/collada/header.py
index b8b78aa..0708db2 100644
--- a/collada/header.py
+++ b/collada/header.py
@@ -786,7 +786,7 @@ def render_image(state, collada, image, image_index):
     resource_name = image_resource_name(state, image.image_source.uri)
     image_name = sanitize_name(state, image.id, image)
 
-    yield from lang_header.render_image(image.id, image_name, resource_name)
+    yield from lang_header.render_image(image.id, image_name, resource_name, image.image_source.uri)
 
 def render_library_images(state, collada):
     image_index = 0
diff --git a/collada/lua_header.py b/collada/lua_header.py
index 5f0586b..559ee28 100644
--- a/collada/lua_header.py
+++ b/collada/lua_header.py
@@ -191,7 +191,7 @@ def render_opt_color(field_name, color):
     yield f"{field_name} = {render_float_tuple(color.value)},"
 
 def render_opt_texture(field_name, image_index, image_id):
-    yield f"{field_name} = {{ .image_index = {image_index} }}, -- {image_id}"
+    yield f"{field_name} = {{ image_index = {image_index} }}, -- {image_id}"
 
 def render_opt_color_or_texture(field_name, opt_type, render_body):
     yield f"{field_name} = {{"
@@ -231,6 +231,9 @@ def render_descriptor(namespace):
     yield "nodes = nodes,"
     yield "nodes_count = #nodes,"
     yield ""
+    yield "geometries = geometries,"
+    yield "nodes_count = #geometries,"
+    yield ""
     yield "inputs_list = inputs_list,"
     yield "inputs_list_count = #inputs_list,"
     yield ""
@@ -296,10 +299,10 @@ def render_light(light_name, light_type, color):
     yield f"color = {render_float_tuple(color)},"
     yield "}"
 
-def render_image(image_id, image_name, resource_name):
-    yield f"-- {image.id}"
+def render_image(image_id, image_name, resource_name, uri):
+    yield f"-- {image_id}"
     yield f"local image_{image_name} = {{"
-    yield f'resource_name = L"{resource_name}",'
+    yield f'uri = "{uri}",'
     yield "}"
 
 def render_library_images(image_names):