Index: uspace/lib/cpp/include/impl/deque.hpp
===================================================================
--- uspace/lib/cpp/include/impl/deque.hpp	(revision 46cf7bf2b0c1d8f3c2351207136527ee1fe2c28a)
+++ uspace/lib/cpp/include/impl/deque.hpp	(revision 0e5e8bf9969aa30c5d54c5f019afab3cb17654d4)
@@ -460,4 +460,6 @@
                 swap(other);
                 other.clear();
+
+                return *this;
             }
 
@@ -577,5 +579,6 @@
                 if (sz <= size_)
                 {
-                    for (size_type i = 0; i < size_ - sz; ++i)
+                    auto count = size_ - sz;
+                    for (size_type i = 0; i < count; ++i)
                         pop_back();
                 }
@@ -583,5 +586,6 @@
                 {
                     value_type value{};
-                    for (size_type i = 0; i < sz - size_; ++i)
+                    auto count = sz - size_;
+                    for (size_type i = 0; i < count; ++i)
                         push_back(value);
                 }
@@ -592,10 +596,12 @@
                 if (sz <= size_)
                 {
-                    for (size_type i = 0; i < size_ - sz; ++i)
+                    auto count = size_ - sz;
+                    for (size_type i = 0; i < count; ++i)
                         pop_back();
                 }
                 else
                 {
-                    for (size_type i = 0; i < sz - size_; ++i)
+                    auto count = sz - size_;
+                    for (size_type i = 0; i < count; ++i)
                         push_back(value);
                 }
@@ -782,6 +788,6 @@
                 return insert(
                     position,
-                    aux::insert_iterator{0u, value},
-                    aux::insert_iterator{n}
+                    aux::insert_iterator<int>{0u, value},
+                    aux::insert_iterator<int>{n}
                 );
             }
Index: uspace/lib/cpp/include/impl/iterator.hpp
===================================================================
--- uspace/lib/cpp/include/impl/iterator.hpp	(revision 46cf7bf2b0c1d8f3c2351207136527ee1fe2c28a)
+++ uspace/lib/cpp/include/impl/iterator.hpp	(revision 0e5e8bf9969aa30c5d54c5f019afab3cb17654d4)
@@ -132,5 +132,5 @@
         {
             diff_t diff{};
-            while (++first != last)
+            while (first++ != last)
                 ++diff;
 
