diff --git a/include/boost/unordered/detail/foa.hpp b/include/boost/unordered/detail/foa.hpp
index 9e7c1391..da63318f 100644
--- a/include/boost/unordered/detail/foa.hpp
+++ b/include/boost/unordered/detail/foa.hpp
@@ -1621,8 +1621,8 @@ private:
   struct destroy_element_on_exit
   {
     ~destroy_element_on_exit(){this_->destroy_element(p);}
-    table      *this_;
-    value_type *p;
+    table        *this_;
+    storage_type *p;
   };
 
   void copy_elements_from(const table& x)
diff --git a/include/boost/unordered/unordered_node_map.hpp b/include/boost/unordered/unordered_node_map.hpp
index fe5e6132..4ba8ead6 100644
--- a/include/boost/unordered/unordered_node_map.hpp
+++ b/include/boost/unordered/unordered_node_map.hpp
@@ -168,7 +168,7 @@ namespace boost {
           return kv->first;
         }
 
-        static value_type&& move(storage_type& x) { return std::move(x); }
+        static storage_type&& move(storage_type& x) { return std::move(x); }
       };
 
       using table_type = detail::foa::table<map_types, Hash, KeyEqual,