diff --git a/oi/FuncGen.cpp b/oi/FuncGen.cpp
index fbe6658..11298ca 100644
--- a/oi/FuncGen.cpp
+++ b/oi/FuncGen.cpp
@@ -625,11 +625,11 @@ template <typename Ctx, typename T>
 constexpr inst::Field make_field(std::string_view name) {
   return inst::Field{
       sizeof(T),
-      ExclusiveSizeProvider<T>::size,
+      ExclusiveSizeProvider<std::decay_t<T>>::size,
       name,
-      NameProvider<T>::names,
-      TypeHandler<Ctx, T>::fields,
-      TypeHandler<Ctx, T>::processors,
+      NameProvider<std::decay_t<T>>::names,
+      TypeHandler<Ctx, std::decay_t<T>>::fields,
+      TypeHandler<Ctx, std::decay_t<T>>::processors,
       std::is_fundamental_v<T>,
   };
 }
diff --git a/test/integration/std_smart_ptr.toml b/test/integration/std_smart_ptr.toml
index c9ab383..d0bddb6 100644
--- a/test/integration/std_smart_ptr.toml
+++ b/test/integration/std_smart_ptr.toml
@@ -32,6 +32,31 @@ definitions = '''
       }
     ]
     '''
+  [cases.unique_ptr_const_uint64_empty]
+    param_types = ["std::unique_ptr<const std::uint64_t>&"]
+    setup = "return {nullptr};"
+    expect_json = '''
+    [
+      {
+        "staticSize": 8,
+        "dynamicSize": 0,
+        "exclusiveSize": 8,
+        "length": 0,
+        "capacity": 1,
+        "elementStaticSize": 8
+      }
+    ]
+    '''
+    expect_json_v2 = '''
+    [
+      {
+        "staticSize": 8,
+        "exclusiveSize": 8,
+        "length": 0,
+        "capacity": 1
+      }
+    ]
+    '''
   [cases.unique_ptr_uint64_present]
     param_types = ["std::unique_ptr<std::uint64_t>&"]
     setup = "return {std::make_unique<std::uint64_t>(64)};"
@@ -82,6 +107,30 @@ definitions = '''
       }
     ]
     '''
+  [cases.unique_ptr_const_vector_empty]
+    param_types = ["std::unique_ptr<const std::vector<std::uint64_t>>&"]
+    setup = "return {nullptr};"
+    expect_json = '''
+    [
+      {
+        "staticSize": 8,
+        "dynamicSize": 0,
+        "length": 0,
+        "capacity": 1,
+        "elementStaticSize": 24
+      }
+    ]
+    '''
+    expect_json_v2 = '''
+    [
+      {
+        "staticSize": 8,
+        "exclusiveSize": 8,
+        "length": 0,
+        "capacity": 1
+      }
+    ]
+    '''
   [cases.unique_ptr_vector_present]
     param_types = ["std::unique_ptr<std::vector<std::uint64_t>>&"]
     setup = "return {std::make_unique<std::vector<std::uint64_t>>(std::initializer_list<std::uint64_t>({1,2,3,4,5}))};"
@@ -188,6 +237,30 @@ definitions = '''
       }
     ]
     '''
+  [cases.shared_ptr_const_uint64_empty]
+    param_types = ["std::shared_ptr<const std::uint64_t>&"]
+    setup = "return {nullptr};"
+    expect_json = '''
+    [
+      {
+        "staticSize": 16,
+        "dynamicSize": 0,
+        "length": 0,
+        "capacity": 1,
+        "elementStaticSize": 8
+      }
+    ]
+    '''
+    expect_json_v2 = '''
+    [
+      {
+        "staticSize": 16,
+        "exclusiveSize": 16,
+        "length": 0,
+        "capacity": 1
+      }
+    ]
+    '''
   [cases.shared_ptr_uint64_present]
     param_types = ["std::shared_ptr<std::uint64_t>&"]
     setup = "return std::make_shared<std::uint64_t>(64);"
@@ -241,6 +314,30 @@ definitions = '''
       }
     ]
     '''
+  [cases.shared_ptr_const_vector_empty]
+    param_types = ["std::shared_ptr<const std::vector<std::uint64_t>>&"]
+    setup = "return {nullptr};"
+    expect_json = '''
+    [
+      {
+        "staticSize": 16,
+        "dynamicSize": 0,
+        "length": 0,
+        "capacity": 1,
+        "elementStaticSize": 24
+      }
+    ]
+    '''
+    expect_json_v2 = '''
+    [
+      {
+        "staticSize": 16,
+        "exclusiveSize": 16,
+        "length": 0,
+        "capacity": 1
+      }
+    ]
+    '''
   [cases.shared_ptr_vector_present]
     param_types = ["std::shared_ptr<std::vector<std::uint64_t>>&"]
     setup = "return std::make_shared<std::vector<std::uint64_t>>(std::initializer_list<std::uint64_t>({1,2,3,4,5}));"
diff --git a/types/shrd_ptr_type.toml b/types/shrd_ptr_type.toml
index 3439bf3..ab42eef 100644
--- a/types/shrd_ptr_type.toml
+++ b/types/shrd_ptr_type.toml
@@ -60,7 +60,7 @@ el.pointer = std::get<ParsedData::VarInt>(d.val).value;
 type = """
 types::st::Sum<DB,
   types::st::Unit<DB>,
-  typename TypeHandler<Ctx, T0>::type>
+  typename TypeHandler<Ctx, std::decay_t<T0>>::type>
 """
 func = """
 #ifdef __GLIBCXX__
diff --git a/types/uniq_ptr_type.toml b/types/uniq_ptr_type.toml
index f71cff4..90663a4 100644
--- a/types/uniq_ptr_type.toml
+++ b/types/uniq_ptr_type.toml
@@ -61,7 +61,7 @@ el.pointer = std::get<ParsedData::VarInt>(d.val).value;
 type = """
 types::st::Sum<DB,
   types::st::Unit<DB>,
-  typename TypeHandler<Ctx, T0>::type>
+  typename TypeHandler<Ctx, std::decay_t<T0>>::type>
 """
 func = """
 auto sum = std::get<ParsedData::Sum>(d.val);