diff --git a/common.cpp b/common.cpp
index a159047b6..0e5219e6b 100644
--- a/common.cpp
+++ b/common.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: common.cpp,v 1.3 2003/02/16 17:04:38 mosu Exp $
+    \version \$Id: common.cpp,v 1.4 2003/02/25 13:17:33 mosu Exp $
     \brief helper functions, common variables
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -126,7 +126,7 @@ char *map_video_codec_fourcc(char *fourcc, int *set_codec_private) {
            !strcasecmp(fourcc, "MP43"))
     return "V_MSMPEG4";
   else {
-    fprintf(stderr, "WARNING: Unknonw FourCC '%s'. Please contact "
+    fprintf(stderr, "Warning: Unknonw FourCC '%s'. Please contact "
             "Moritz Bunkus <moritz@bunkus.org>\n", fourcc);
     *set_codec_private = 1;
     return "V_MS/VFW/FOURCC";
@@ -142,7 +142,7 @@ char *map_audio_codec_id(int id, int bps, int *set_codec_private) {
     else if (bps == 24)
       return "A_PCM24IN";
     else {
-      fprintf(stderr, "WARNING: Unknown codec ID '%d' (0x%04x), %d bps. Please "
+      fprintf(stderr, "Warning: Unknown codec ID '%d' (0x%04x), %d bps. Please "
               "contact Moritz Bunkus <moritz@bunkus.org>\n", id, id, bps);
       *set_codec_private = 1;
       return "A_MS/ACM";
@@ -152,7 +152,7 @@ char *map_audio_codec_id(int id, int bps, int *set_codec_private) {
   else if (id == 0x2000) // AC3
     return "A_DOL_AC3";
   else {
-    fprintf(stderr, "WARNING: Unknown codec ID '%d' (0x%04x), %d bps. Please "
+    fprintf(stderr, "Warning: Unknown codec ID '%d' (0x%04x), %d bps. Please "
             "contact Moritz Bunkus <moritz@bunkus.org>\n", id, id, bps);
     *set_codec_private = 1;
     return "A_MS/ACM";
diff --git a/mkvinfo.cpp b/mkvinfo.cpp
index e4ba1c540..2290db613 100644
--- a/mkvinfo.cpp
+++ b/mkvinfo.cpp
@@ -12,7 +12,7 @@
 
 /*!
     \file
-    \version \$Id: mkvinfo.cpp,v 1.1 2003/02/25 09:28:55 mosu Exp $
+    \version \$Id: mkvinfo.cpp,v 1.2 2003/02/25 13:17:33 mosu Exp $
     \brief retrieves and displays information about a Matroska file
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -272,7 +272,7 @@ void process_file() {
                   fprintf(stdout, " at %llu", last_pos);
                 fprintf(stdout, "\n");
                 if (find_track(uint8(tnum)) != NULL)
-                  fprintf(stdout, "(%s) |  + WARNING: There's more than one "
+                  fprintf(stdout, "(%s) |  + Warning: There's more than one "
                           "track with the number %u.\n", NAME,
                           uint8(tnum));
 
diff --git a/mkvmerge.cpp b/mkvmerge.cpp
index a2f113299..25f007c51 100644
--- a/mkvmerge.cpp
+++ b/mkvmerge.cpp
@@ -13,7 +13,7 @@
 
 /*!
     \file
-    \version \$Id: mkvmerge.cpp,v 1.12 2003/02/24 12:31:17 mosu Exp $
+    \version \$Id: mkvmerge.cpp,v 1.13 2003/02/25 13:17:33 mosu Exp $
     \brief command line parameter parsing, looping, output handling
     \author Moritz Bunkus         <moritz @ bunkus.org>
 */
@@ -340,12 +340,12 @@ static void parse_sync(char *s, audio_sync_t *async) {
 //     if (*c == ':')
 //       num_colons++;
 //     else if ((*c < '0') || (*c > '9')) {
-//       fprintf(stderr, "ERROR: illegal character '%c' in time range.\n", *c);
+//       fprintf(stderr, "Error: illegal character '%c' in time range.\n", *c);
 //       exit(1);
 //     }
 //   }
 //   if (num_colons > 2) {
-//     fprintf(stderr, "ERROR: illegal time range: %s.\n", s);
+//     fprintf(stderr, "Error: illegal time range: %s.\n", s);
 //     exit(1);
 //   }
 //   if (num_colons == 0) {
@@ -382,7 +382,7 @@ static void parse_sync(char *s, audio_sync_t *async) {
 //     range->end = 0;
 //   range->start = parse_time(s);
 //   if ((range->end != 0) && (range->end < range->start)) {
-//     fprintf(stderr, "ERROR: end time is set before start time.\n");
+//     fprintf(stderr, "Error: end time is set before start time.\n");
 //     exit(1);
 //   }
 // }
@@ -435,7 +435,7 @@ static void parse_args(int argc, char **argv) {
         fprintf(stderr, "Error: only one output file allowed.\n");
         exit(1);
       }
-      outfile = (char *)strdup(argv[i + 1]);
+      outfile = argv[i + 1];
       i++;
     }