diff --git a/parallel_hashmap/phmap.h b/parallel_hashmap/phmap.h
index 98026ba..b1b2bf8 100644
--- a/parallel_hashmap/phmap.h
+++ b/parallel_hashmap/phmap.h
@@ -1506,6 +1506,10 @@ class raw_hash_set
         friend class raw_hash_set;
 
     public:
+        slot_type* slot() const {
+            return *slot_;
+        }
+
         template <class... Args>
         void operator()(Args&&... args) const {
             assert(*slot_);
@@ -3247,7 +3251,7 @@ class parallel_hash_set
             set.lazy_emplace_at(offset, std::forward<F>(f));
             set.set_ctrl(offset, H2(hashval));
         }
-        return iterator_at(offset);
+        return make_iterator(&inner, set.iterator_at(offset));
     }
 
     template <class K = key_type, class F>
diff --git a/parallel_hashmap/phmap_base.h b/parallel_hashmap/phmap_base.h
index c28bc38..66c8c56 100644
--- a/parallel_hashmap/phmap_base.h
+++ b/parallel_hashmap/phmap_base.h
@@ -4882,8 +4882,8 @@ class LockableBaseImpl
 
     private:
         mutex_type *m_;
-        bool        locked_shared_;
         bool        locked_;
+        bool        locked_shared_;
     };
 
     // ----------------------------------------------------