diff --git a/scribbu/id3v1.hh b/scribbu/id3v1.hh
index dbd7c25..231d798 100644
--- a/scribbu/id3v1.hh
+++ b/scribbu/id3v1.hh
@@ -467,11 +467,11 @@ namespace scribbu {
     void set_start_time(const char *text)
     {
       size_t i = 0, ntext = strlen(text);
-      while (i < ntext && i < 7) {
+      while (i < ntext && i < 6) {
         start_time_[i] = (char)text[i];
         ++i;
       }
-      while (i < 7) {
+      while (i < 6) {
         start_time_[i++] = 0;
       }
       extended_ = true;
@@ -497,11 +497,11 @@ namespace scribbu {
     void set_end_time(const char *text)
     {
       size_t i = 0, ntext = strlen(text);
-      while (i < ntext && i < 7) {
+      while (i < ntext && i < 6) {
         end_time_[i] = (char)text[i];
         ++i;
       }
-      while (i < 7) {
+      while (i < 6) {
         end_time_[i++] = 0;
       }
       extended_ = true;
diff --git a/scribbu/tbt-support.hh b/scribbu/tbt-support.hh
index 903e096..238d31b 100644
--- a/scribbu/tbt-support.hh
+++ b/scribbu/tbt-support.hh
@@ -153,8 +153,7 @@ namespace scribbu
       { }
     };
 
-    class process_and_concatenate:
-      public std::binary_function<std::string, std::shared_ptr<scribbu::tbt_support::term>, std::string>
+    class process_and_concatenate
     {
     public:
       process_and_concatenate(const scribbu::file_info  &fi,
diff --git a/src/dump.cc b/src/dump.cc
index df383ba..43358fb 100644
--- a/src/dump.cc
+++ b/src/dump.cc
@@ -69,7 +69,7 @@ namespace {
   }
 
   /// Dump ID3v2 tags, track data, and/or the ID3v1 tag to stdout
-  class dumper: public std::unary_function<void, fs::path>
+  class dumper
   {
   public:
     /// The format in which we shall dump information to stdout
diff --git a/src/report.cc b/src/report.cc
index 706ddfa..51976da 100644
--- a/src/report.cc
+++ b/src/report.cc
@@ -333,7 +333,7 @@ tdf_reporter::make_entry(const scribbu::file_info                  &fi,
 
 /// A thing that knows how to report on a directory tree full of
 /// ID3v2-tagged files
-class reporting_strategy: public std::unary_function<void, fs::path> {
+class reporting_strategy {
 
 public:
   /// return the # of files successfully processed & the # of failures; "failure"