diff --git a/src/tools/nanorange/iterator/counted_iterator.hpp b/src/tools/nanorange/iterator/counted_iterator.hpp
index 9253090..c7efea3 100644
--- a/src/tools/nanorange/iterator/counted_iterator.hpp
+++ b/src/tools/nanorange/iterator/counted_iterator.hpp
@@ -24,6 +24,9 @@ class counted_iterator {
     template <typename I2>
     friend class counted_iterator;
 
+    I current_{};
+    iter_difference_t<I> cnt_{0};
+
 public:
     using iterator = I;
     using difference_type = iter_difference_t<I>;
@@ -262,10 +265,6 @@ class counted_iterator {
     {
         ranges::iter_swap(x.current_, y.current_);
     }
-
-private:
-    I current_{};
-    iter_difference_t<I> cnt_{0};
 };
 
 }
diff --git a/src/tools/nanorange/iterator/reverse_iterator.hpp b/src/tools/nanorange/iterator/reverse_iterator.hpp
index d4a619f..885fb18 100644
--- a/src/tools/nanorange/iterator/reverse_iterator.hpp
+++ b/src/tools/nanorange/iterator/reverse_iterator.hpp
@@ -133,7 +133,7 @@ class reverse_iterator {
     iter_swap(const reverse_iterator& x,
               const reverse_iterator<I2>&
                   y) noexcept(noexcept(ranges::iter_swap(std::declval<I>(),
-                                                         std::declval<I>())) &&
+                                                         std::declval<I2>())) &&
                               noexcept(--std::declval<I&>()))
         -> std::enable_if_t<indirectly_swappable<I2, I>>