diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
index 72af29a97b..ff9243ad4c 100644
--- a/ext/opus/gstopusenc.c
+++ b/ext/opus/gstopusenc.c
@@ -188,9 +188,11 @@ gst_opus_enc_class_init (GstOpusEncClass * klass)
 {
   GObjectClass *gobject_class;
   GstAudioEncoderClass *base_class;
+  GstElementClass *gstelement_class;
 
   gobject_class = (GObjectClass *) klass;
   base_class = (GstAudioEncoderClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
 
   gobject_class->set_property = gst_opus_enc_set_property;
   gobject_class->get_property = gst_opus_enc_get_property;
diff --git a/ext/opus/gstopusparse.c b/ext/opus/gstopusparse.c
index 8dcc4829fe..fd7024c623 100644
--- a/ext/opus/gstopusparse.c
+++ b/ext/opus/gstopusparse.c
@@ -295,12 +295,10 @@ gst_opus_parse_parse_frame (GstBaseParse * base, GstBaseParseFrame * frame)
       GST_DEBUG_OBJECT (parse, "Found ID header, keeping");
       return GST_BASE_PARSE_FLOW_DROPPED;
     } else if (is_commentheader) {
-      gst_buffer_unmap (frame->buffer, data, size);
       gst_buffer_replace (&parse->comment_header, frame->buffer);
       GST_DEBUG_OBJECT (parse, "Found comment header, keeping");
       return GST_BASE_PARSE_FLOW_DROPPED;
     }
-    gst_buffer_unmap (frame->buffer, data, size);
 
     g_slist_foreach (parse->headers, (GFunc) gst_buffer_unref, NULL);
     parse->headers = NULL;