diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4380f68..5d94232 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,9 @@ project(stl_interfaces)
 set(CXX_STD 14 CACHE STRING "Set to X to enable C++X builds.")
 message("-- Using -std=c++${CXX_STD}")
 
+if (MSVC)
+  add_compile_options(/Zc:__cplusplus)
+endif()
 
 ##################################################
 # Sanitizers
diff --git a/include/boost/stl_interfaces/iterator_interface.hpp b/include/boost/stl_interfaces/iterator_interface.hpp
index 583e0a3..5c29f55 100644
--- a/include/boost/stl_interfaces/iterator_interface.hpp
+++ b/include/boost/stl_interfaces/iterator_interface.hpp
@@ -749,12 +749,12 @@ namespace boost { namespace stl_interfaces { BOOST_STL_INTERFACES_NAMESPACE_V2 {
       constexpr auto operator->()
         requires (!std::same_as<pointer, void> && std::is_reference_v<reference> &&
                   requires (D d) { *d; }) {
-          return detail::make_pointer<pointer>(*derived());
+          return detail::make_pointer<pointer, reference>(*derived());
         }
       constexpr auto operator->() const
         requires (!std::same_as<pointer, void> && std::is_reference_v<reference> &&
                   requires (D const d) { *d; }) {
-          return detail::make_pointer<pointer>(*derived());
+          return detail::make_pointer<pointer, reference>(*derived());
         }
 
       constexpr decltype(auto) operator[](difference_type n) const