diff --git a/Utils/convert_adaptor.h b/Utils/convert_adaptor.h
index 90500697..3b4cf104 100644
--- a/Utils/convert_adaptor.h
+++ b/Utils/convert_adaptor.h
@@ -245,6 +245,6 @@ class iconvert_adaptor : public std::basic_istream<charT, traitsT>
 
   private:
     convert_bufadaptor<charT, traitsT, fromCharT, fromTraitsT> bufadaptor_;
-}; // class basic_socketstream
+}; // class iconvert_adaptor
 
 #endif
diff --git a/Utils/iso8859_1utf8_codecvt.cpp b/Utils/iso8859_1utf8_codecvt.cpp
index c0331f00..24e35ae1 100644
--- a/Utils/iso8859_1utf8_codecvt.cpp
+++ b/Utils/iso8859_1utf8_codecvt.cpp
@@ -3,8 +3,7 @@
 //---------------------------------------------------------------------------
 #include "iso8859_1utf8_codecvt.h"
 //---------------------------------------------------------------------------
-// This facet converts from wide chars to char using the
-// FSS-UTF (UCS2) encoding.
+// This facet converts from ISO8859:1 (Latin 1) chars to UTF-8 encoded chars.
 //
 // Some of this code is derived from work done by Ken Thompson,
 // provided to the X/Open Group.