diff --git a/configure.py b/configure.py
index 952b3c4a..f924ded9 100755
--- a/configure.py
+++ b/configure.py
@@ -1134,8 +1134,10 @@ else:
            description="AR $out")
     n.newline()
 
-n.rule(name="host_cc", command="clang -I include/ -o $out $in",
+n.rule(name="host_cc", command="clang -I include/ -Wno-trigraphs -o $out $in",
            description="host_cc $out")
+n.rule(name="host_cpp", command="clang++ -std=c++03 -I include/ -Wno-trigraphs -o $out $in",
+           description="host_c++ $out")
 n.newline()
 
 ###
@@ -1176,7 +1178,7 @@ for lib in LIBS:
                         "basedir": os.path.dirname(f"$builddir/src/{object}"),
                         "basefile": f"$builddir/src/{object}"
                     })
-            n.build(f"$builddir/host/{object}.o", "host_cc", c_file,
+            n.build(f"$builddir/host/{object}.o", "host_cc" if c_file.endswith(".c") else "host_cpp", c_file,
                     variables={
                         "basedir": os.path.dirname(f"$builddir/src/{object}"),
                         "basefile": f"$builddir/src/{object}"
diff --git a/include/Kyoto/TReservedAverage.hpp b/include/Kyoto/TReservedAverage.hpp
index 8a3d77a3..39771ff9 100644
--- a/include/Kyoto/TReservedAverage.hpp
+++ b/include/Kyoto/TReservedAverage.hpp
@@ -9,7 +9,7 @@
 #include "rstl/reserved_vector.hpp"
 
 template < typename T, int N >
-class TReservedAverage : rstl::reserved_vector< T, N > {
+class TReservedAverage : public rstl::reserved_vector< T, N > {
 public:
   TReservedAverage() {}
   TReservedAverage(const T& value) {
diff --git a/include/rstl/pointer_iterator.hpp b/include/rstl/pointer_iterator.hpp
index a48281a3..09297608 100644
--- a/include/rstl/pointer_iterator.hpp
+++ b/include/rstl/pointer_iterator.hpp
@@ -77,9 +77,9 @@ class pointer_iterator : public const_pointer_iterator< T, Vec, Alloc > {
   typedef const_pointer_iterator< T, Vec, Alloc > base;
 
 public:
-  typedef base::difference_type difference_type;
-  typedef base::iterator_category iterator_category;
-  typedef base::value_type value_type;
+  typedef typename base::difference_type difference_type;
+  typedef typename base::iterator_category iterator_category;
+  typedef typename base::value_type value_type;
 
   pointer_iterator() : const_pointer_iterator< T, Vec, Alloc >(nullptr) {}
   pointer_iterator(T* begin) : const_pointer_iterator< T, Vec, Alloc >(begin) {}