diff --git a/Compiler/Template/CodegenCppCommon.tpl b/Compiler/Template/CodegenCppCommon.tpl
index 5c8e93603ef..ae3a7f20809 100644
--- a/Compiler/Template/CodegenCppCommon.tpl
+++ b/Compiler/Template/CodegenCppCommon.tpl
@@ -2081,14 +2081,12 @@ template daeExpCall(Exp call, Context context, Text &preExp /*BUFP*/, Text &varD
     '<%tvar%>'
 
   case CALL(path=IDENT(name="identity"), expLst={A}) then
-    let var1 = daeExp(A, context, &preExp /*BUFC*/, &varDecls /*BUFD*/,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
-    let arr_tp_str = '<%expTypeFromExpArray(A)%>'
-    let tvar = tempDecl(arr_tp_str, &varDecls /*BUFD*/)
-    let &preExp += 'identity_alloc_<%arr_tp_str%>(<%var1%>, &<%tvar%>);<%\n%>'
+    let var1 = daeExp(A, context, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
+    let tvar = tempDecl('DynArrayDim2<int>', &varDecls)
+    let &preExp += 'identity_alloc(<%var1%>, <%tvar%>);<%\n%>'
     '<%tvar%>'
 
-   case CALL(path=IDENT(name="rem"),
-             expLst={e1, e2}) then
+  case CALL(path=IDENT(name="rem"), expLst={e1, e2}) then
     let var1 = daeExp(e1, context, &preExp, &varDecls,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     let var2 = daeExp(e2, context, &preExp, &varDecls,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     let typeStr = expTypeFromExpShort(e1)
@@ -2268,6 +2266,7 @@ template expTypeFromExpFlag(Exp exp, Integer flag)
   case e as RELATION(__) then expTypeFromOpFlag(e.operator, flag)
   case IFEXP(__)         then expTypeFromExpFlag(expThen, flag)
   case CALL(attr=CALL_ATTR(__))          then expTypeFlag(attr.ty, flag)
+  case c as RECORD(__)   then expTypeFlag(c.ty, flag)
   case c as ARRAY(__)
   case c as MATRIX(__)
   case c as RANGE(__)
@@ -2276,9 +2275,9 @@ template expTypeFromExpFlag(Exp exp, Integer flag)
   case c as CODE(__)     then expTypeFlag(c.ty, flag)
   case ASUB(__)          then expTypeFromExpFlag(exp, flag)
   case REDUCTION(__)     then expTypeFlag(typeof(exp), flag)
-  case BOX(__)
   case CONS(__)
   case LIST(__)
+  case SIZE(__)          then expTypeFlag(typeof(exp), flag)
 
   case META_TUPLE(__)
   case META_OPTION(__)
@@ -2287,7 +2286,7 @@ template expTypeFromExpFlag(Exp exp, Integer flag)
   case BOX(__)           then match flag case 1 then "metatype" else "modelica_metatype"
   case c as UNBOX(__)    then expTypeFlag(c.ty, flag)
   case c as SHARED_LITERAL(__) then expTypeFromExpFlag(c.exp, flag)
-  else ""
+  else 'ERROR:expTypeFromExpFlag <%printExpStr(exp)%> '
 end expTypeFromExpFlag;
 
 template expTypeFromOpFlag(Operator op, Integer flag)
diff --git a/SimulationRuntime/cpp/Core/Math/ArrayOperations.cpp b/SimulationRuntime/cpp/Core/Math/ArrayOperations.cpp
index a60dd8c2a19..755142996b7 100644
--- a/SimulationRuntime/cpp/Core/Math/ArrayOperations.cpp
+++ b/SimulationRuntime/cpp/Core/Math/ArrayOperations.cpp
@@ -211,6 +211,13 @@ void fill_array_from_shape(const spec_type& sp,BaseArray<T>& s,BaseArray<T>& d)
      delete [] data;
 }
 
+void identity_alloc(size_t n, DynArrayDim2<int>& I)
+{
+  I.setDims(n, n);
+  fill_array(I, 0);
+  for (size_t i = 1; i <= n; i++)
+    I(i, i) = 1;
+}
 
  //template < typename T , size_t NumDims, size_t NumDims2 >
 template <typename T>
@@ -553,6 +560,9 @@ transpose_array(const BaseArray<int>& x, BaseArray<int>& a);
 template void BOOST_EXTENSION_EXPORT_DECL
 transpose_array(const BaseArray<bool>& x, BaseArray<bool>& a);
 
+void BOOST_EXTENSION_EXPORT_DECL
+identity_alloc(size_t n, DynArrayDim2<int>& I);
+
 template void BOOST_EXTENSION_EXPORT_DECL
 promote_array(size_t n, const BaseArray<double>& s, BaseArray<double>& d);
 template void BOOST_EXTENSION_EXPORT_DECL
diff --git a/SimulationRuntime/cpp/Include/Core/Math/ArrayOperations.h b/SimulationRuntime/cpp/Include/Core/Math/ArrayOperations.h
index 66878e0fe4c..e88a2a984fe 100644
--- a/SimulationRuntime/cpp/Include/Core/Math/ArrayOperations.h
+++ b/SimulationRuntime/cpp/Include/Core/Math/ArrayOperations.h
@@ -49,6 +49,8 @@ void create_array_from_shape(const spec_type& sp,BaseArray<T>& s,BaseArray<T>& d
 template < typename T >
 void fill_array_from_shape(const spec_type& sp,BaseArray<T>& s,BaseArray<T>& d);
 
+void identity_alloc(size_t n, DynArrayDim2<int>& I);
+
 template <typename T>
 void promote_array(size_t n, const BaseArray<T>& s, BaseArray<T>& d);