diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index dac254353..b55e51b89 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -284,7 +284,7 @@ struct StructDef : public Definition {
   size_t minalign;  // What the whole object needs to be aligned to.
   size_t bytesize;  // Size if fixed.
 
-  std::unique_ptr<std::string> original_location;
+  flatbuffers::unique_ptr<std::string> original_location;
 };
 
 inline bool IsStruct(const Type &type) {
diff --git a/include/flatbuffers/stl_emulation.h b/include/flatbuffers/stl_emulation.h
index c025eca1a..16d35f2e9 100644
--- a/include/flatbuffers/stl_emulation.h
+++ b/include/flatbuffers/stl_emulation.h
@@ -170,7 +170,7 @@ inline void vector_emplace_back(std::vector<T> *vector, V &&data) {
       return *this;
     }
 
-    const T& operator*() const { return ptr_; }
+    const T& operator*() const { return *ptr_; }
     T* operator->() const { return ptr_; }
     T* get() const noexcept { return ptr_; }
     explicit operator bool() const { return ptr_ != nullptr; }
diff --git a/tests/test.cpp b/tests/test.cpp
index 042994369..fb20d75ef 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -1661,7 +1661,7 @@ void FlexBuffersTest() {
       int ints[] = { 1, 2, 3 };
       slb2.Vector("bar", ints, 3);
       slb2.FixedTypedVector("bar3", ints, 3);
-      slb.Bool("bool", true);
+      slb2.Bool("bool", true);
       slb2.Double("foo", 100);
       slb2.Map("mymap", [](flexbuffers::Builder& slb3) {
         slb3.String("foo", "Fred");  // Testing key and string reuse.