Index: uspace/lib/cpp/include/internal/hash_table.hpp
===================================================================
--- uspace/lib/cpp/include/internal/hash_table.hpp	(revision 04fa15862b9a9fcff3265fe8598e2ad32e2820a9)
+++ uspace/lib/cpp/include/internal/hash_table.hpp	(revision 947ad13963b9d7ea132d7519568e6b8055f6441c)
@@ -152,5 +152,5 @@
 
         template<class Table, class Key>
-        static typename Table::hint_type find_insertion_spot(const Table& table, const Key& key)
+        static typename Table::place_type find_insertion_spot(const Table& table, const Key& key)
         {
             auto idx = table.get_bucket_idx_(key);
@@ -374,5 +374,5 @@
 
         template<class Table, class Key>
-        static typename Table::hint_type find_insertion_spot(const Table& table, const Key& key)
+        static typename Table::place_type find_insertion_spot(const Table& table, const Key& key)
         {
             auto idx = table.get_bucket_idx_(key);
@@ -973,5 +973,5 @@
             using node_type = list_node<value_type>;
 
-            using hint_type = tuple<
+            using place_type = tuple<
                 hash_table_bucket<value_type, size_type>*,
                 list_node<value_type>*, size_type
@@ -1346,5 +1346,5 @@
             }
 
-            bool is_eq_to(const hash_table& other)
+            bool is_eq_to(const hash_table& other) const
             {
                 // TODO: implement
@@ -1359,15 +1359,15 @@
             }
 
-            hint_type find_insertion_spot(const key_type& key)
+            place_type find_insertion_spot(const key_type& key) const
             {
                 return Policy::find_insertion_spot(*this, key);
             }
 
-            hint_type find_insertion_spot(key_type&& key)
+            place_type find_insertion_spot(key_type&& key) const
             {
                 return Policy::find_insertion_spot(*this, key);
             }
 
-            const key_type& get_key(const value_type& val)
+            const key_type& get_key(const value_type& val) const
             {
                 return key_extractor_(val);
@@ -1392,5 +1392,5 @@
             {
                 if (idx < bucket_count_)
-                    return &table_[idx];
+                    return table_[idx]->head;
                 else
                     return nullptr;