diff --git a/cimgen/languages/cpp/templates/cpp_header_template.mustache b/cimgen/languages/cpp/templates/cpp_header_template.mustache
index 9147b0c5..ee05a509 100644
--- a/cimgen/languages/cpp/templates/cpp_header_template.mustache
+++ b/cimgen/languages/cpp/templates/cpp_header_template.mustache
@@ -13,6 +13,7 @@ Generated from the CGMES files via cimgen: https://github.com/sogno-platform/cim
 #include "BaseClassDefiner.hpp"
 #include "CGMESProfile.hpp"
 #include "CimClassDetails.hpp"
+
 {{#attribute_class_includes}}
 #include "{{.}}.hpp"
 {{/attribute_class_includes}}
diff --git a/cimgen/languages/cpp/templates/cpp_object_template.mustache b/cimgen/languages/cpp/templates/cpp_object_template.mustache
index fdb0e866..364b5f59 100644
--- a/cimgen/languages/cpp/templates/cpp_object_template.mustache
+++ b/cimgen/languages/cpp/templates/cpp_object_template.mustache
@@ -37,7 +37,7 @@ static const std::map<std::string, AttrDetails>& getClassAttrDetailsMap()
 		{ "{{domain}}.{{label}}", { "{{attribute_namespace}}", { {{#attr_origin}}CGMESProfile::{{.}}, {{/attr_origin}}} } },
 {{/attributes}}
 	};
-    return ClassAttrDetailsMap;
+	return ClassAttrDetailsMap;
 }
 
 {{class_name}}::{{class_name}}(){{nullptr_assigns}} {}
diff --git a/cimgen/languages/java/templates/java_class.mustache b/cimgen/languages/java/templates/java_class.mustache
index 71212646..e1ffdef7 100644
--- a/cimgen/languages/java/templates/java_class.mustache
+++ b/cimgen/languages/java/templates/java_class.mustache
@@ -137,7 +137,7 @@ public class {{class_name}} extends {{subclass_of}} {
     private {{attribute_class}} {{variable_name}}; // ManyToOne
 {{/is_attribute_with_inverse_list}}
 {{^is_attribute_with_inverse_list}}
-    private {{attribute_class}} {{variable_name}}; // OneToOne
+    private {{attribute_class}} {{variable_name}};{{#inverse_setter}} // OneToOne{{/inverse_setter}}
 {{/is_attribute_with_inverse_list}}
 
     private String {{variable_name}}Id;
@@ -180,7 +180,7 @@ public class {{class_name}} extends {{subclass_of}} {
     private Set<{{attribute_class}}> {{variable_name}} = new HashSet<>(); // ManyToMany
 {{/is_attribute_with_inverse_list}}
 {{^is_attribute_with_inverse_list}}
-    private Set<{{attribute_class}}> {{variable_name}} = new HashSet<>(); // OneToMany
+    private Set<{{attribute_class}}> {{variable_name}} = new HashSet<>();{{#inverse_setter}} // OneToMany{{/inverse_setter}}
 {{/is_attribute_with_inverse_list}}
 
     private Set<String> {{variable_name}}IdSet = new HashSet<>();
diff --git a/cimgen/languages/python/lang_pack.py b/cimgen/languages/python/lang_pack.py
index cf52b7b8..ee2752d6 100644
--- a/cimgen/languages/python/lang_pack.py
+++ b/cimgen/languages/python/lang_pack.py
@@ -109,7 +109,7 @@ def _default_value(attribute: dict) -> str:
     if attribute["is_class_attribute"]:
         return "None"
     if attribute["is_list_attribute"]:
-        return '"list"'
+        return "None"
     # primitive attribute
     if attribute["attribute_class"] == "Integer":
         return "0"
diff --git a/cimgen/languages/python/templates/cimpy_class_template.mustache b/cimgen/languages/python/templates/cimpy_class_template.mustache
index ccdc262d..9f966084 100644
--- a/cimgen/languages/python/templates/cimpy_class_template.mustache
+++ b/cimgen/languages/python/templates/cimpy_class_template.mustache
@@ -32,7 +32,7 @@ class {{class_name}}({{subclass_of}}):
 {{/super_init}}
 
 {{#attributes}}
-        self.{{label}} = {{label}}
+        self.{{label}} = {{label}}{{#is_list_attribute}} or []{{/is_list_attribute}}
 {{/attributes}}
 {{^attributes}}
         pass