diff --git a/calexium_lib b/calexium_lib
index a3acb34..eb2fde0 160000
--- a/calexium_lib
+++ b/calexium_lib
@@ -1 +1 @@
-Subproject commit a3acb343c746388ec4fb76fceabc1f22e9f3c37d
+Subproject commit eb2fde090283bc3b3544600818bb68f2eafe3541
diff --git a/densaku_lib b/densaku_lib
index 7be0acc..25d756b 160000
--- a/densaku_lib
+++ b/densaku_lib
@@ -1 +1 @@
-Subproject commit 7be0acc189ec7b831dce1255ac3e498c0002305e
+Subproject commit 25d756bcd7e519bc16eb30aa368b96812c2c30b9
diff --git a/src/generation/files.anubis b/src/generation/files.anubis
index 9656d27..514a706 100644
--- a/src/generation/files.anubis
+++ b/src/generation/files.anubis
@@ -44,7 +44,7 @@ public define Maybe(One)
   println("Current Messages SHA1 = "+messages_SHA1);  
 
   
-  if types_SHA1 = current_types_SHA1 then
+  if types_SHA1 = current_types_SHA1 & messages_SHA1 = current_messages_SHA1 then
     success(println("Types and messages already generated, nothing to do"))
   else 
   if check_types(types) is 
diff --git a/src/generation/types_messages.anubis b/src/generation/types_messages.anubis
index 6b200b5..9830947 100644
--- a/src/generation/types_messages.anubis
+++ b/src/generation/types_messages.anubis
@@ -64,10 +64,10 @@ public define String
       "add_int32("+type_msg+", \""+field_name+"\", _"+name+")",
     string  then
       "add_string("+type_msg+", \""+field_name+"\", _"+name+")",
-    float32   then
+    float   then
       "add_float32("+type_msg+", \""+field_name+"\", _"+name+")",
-    float64   then
-      "add_float64("+type_msg+", \""+field_name+"\", _"+name+")",
+//    float64   then
+//      "add_float64("+type_msg+", \""+field_name+"\", _"+name+")",
     ds_type(type_name)  then
       "add_message("+type_msg+", \""+field_name+"\", to_Message(_"+name+"))",
     extern_type(type_name, _) then //external type. No need to check
@@ -210,8 +210,8 @@ public define String
     word16                    then indent + "with " + name + " = find_int16_list("+type_msg+", \""+field_name+"\"),\n",
     word32                    then indent + "with " + name + " = find_int32_list("+type_msg+", \""+field_name+"\"),\n",
     string                    then indent + "with " + name + " = find_string_list("+type_msg+", \""+field_name+"\"),\n",
-    float32                   then indent + "with " + name + " = find_float32_list("+type_msg+", \""+field_name+"\"),\n",
-    float64                   then indent + "with " + name + " = find_float64_list("+type_msg+", \""+field_name+"\"),\n",
+    float                     then indent + "with " + name + " = find_float32_list("+type_msg+", \""+field_name+"\"),\n",
+//    float64                   then indent + "with " + name + " = find_float64_list("+type_msg+", \""+field_name+"\"),\n",
     ds_type(type_name)        then
         brace_counter <- *brace_counter + 1;
         indent +"with mb_"+name+" = map_escape(( Message msg ) |-> (Maybe("+dump(anb_type)+ ")) from_Message(msg), find_message_list("+type_msg+", \""+field_name+"\")),\n"+
@@ -257,12 +257,12 @@ public define String
     string  then
       brace_counter <- (*brace_counter + 1);
       indent + "if find_string("+type_msg+", \""+field_name+"\")"+" is {failure then failure,  success("+name+") then\n",
-    float32 then
+    float then
       brace_counter <- (*brace_counter + 1);    
       indent + "if find_float32("+type_msg+", \""+field_name+"\)"+" is {failure then failure,  success("+name+") then\n",
-    float64 then
-      brace_counter <- (*brace_counter + 1);    
-      indent + "if find_float64("+type_msg+", \""+field_name+"\)"+" is {failure then failure,  success("+name+") then\n",
+//    float64 then
+//      brace_counter <- (*brace_counter + 1);    
+//      indent + "if find_float64("+type_msg+", \""+field_name+"\)"+" is {failure then failure,  success("+name+") then\n",
     ds_type(type_name)  then
       brace_counter <- (*brace_counter + 2);      
       indent + "if find_message("+type_msg+", \""+field_name+"\")"+" is {failure then failure,  success("+name+"_msg) then\n"+
--
libgit2 0.21.4