diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c
index e9e0928b10..e61ec6ce04 100644
--- a/gst/isomp4/gstqtmux.c
+++ b/gst/isomp4/gstqtmux.c
@@ -385,8 +385,7 @@ gst_qt_mux_pad_reset (GstQTPad * qtpad)
   qtpad->buf_head = 0;
   qtpad->buf_tail = 0;
 
-  if (qtpad->last_buf)
-    gst_buffer_replace (&qtpad->last_buf, NULL);
+  gst_buffer_replace (&qtpad->last_buf, NULL);
 
   if (qtpad->tags) {
     gst_tag_list_unref (qtpad->tags);
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 84b56ee3f3..b766a3803f 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -2969,8 +2969,8 @@ qtdemux_parse_moof (GstQTDemux * qtdemux, const guint8 * buffer, guint length,
           GST_TIME_ARGS (decode_time_ts));
 
       /* Discard the fragment buffer timestamp info to avoid using it.
-       * Rely on tfdt instead as it is more accurate than the timetamp
-       * that is fetches from a manifest/playlist and is usually
+       * Rely on tfdt instead as it is more accurate than the timestamp
+       * that is fetched from a manifest/playlist and is usually
        * less accurate. */
       qtdemux->fragment_start = -1;
     }