diff --git a/FStream.hxx.in b/FStream.hxx.in
index 8170fb37b58543dd1f6dc8f946de9056b9758bfc..c340c55a3cbe85dd2f1ed21493ff775c74141133 100644
--- a/FStream.hxx.in
+++ b/FStream.hxx.in
@@ -81,7 +81,7 @@ namespace @KWSYS_NAMESPACE@
 
     internal_buffer_type *rdbuf() const
     {
-      return buf_.get();
+      return buf_;
     }
 
     ~basic_ifstream()
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 4649f3b23451b5d0237b783cd2748f5c904acdb6..f4a443f98ce5b64819c6b0dadfd50422d66785f5 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2115,10 +2115,10 @@ bool SystemTools::CopyFileAlways(const char* source, const char* destination)
   SystemTools::RemoveFile(destination);
 
 #if defined(_WIN32) || defined(__CYGWIN__)
-  kwsys_ios::ofstream fout(destination,
+  kwsys::ofstream fout(destination,
                      kwsys_ios::ios::binary | kwsys_ios::ios::out | kwsys_ios::ios::trunc);
 #else
-  kwsys_ios::ofstream fout(destination,
+  kwsys::ofstream fout(destination,
                      kwsys_ios::ios::out | kwsys_ios::ios::trunc);
 #endif
   if(!fout)