diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c
index 64524f7539..683a4783d4 100644
--- a/ext/pango/gsttextoverlay.c
+++ b/ext/pango/gsttextoverlay.c
@@ -1945,8 +1945,8 @@ gst_text_overlay_push_frame (GstTextOverlay * overlay, GstBuffer * video_frame)
             ypos, ypos + overlay->image_height);
         break;
       case GST_VIDEO_FORMAT_xBGR:
-        gst_text_overlay_shade_xBGR (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
+        gst_text_overlay_shade_xBGR (overlay, data,
+            xpos, xpos + overlay->image_width,
             ypos, ypos + overlay->image_height);
         break;
       case GST_VIDEO_FORMAT_BGRx:
@@ -1955,28 +1955,28 @@ gst_text_overlay_push_frame (GstTextOverlay * overlay, GstBuffer * video_frame)
             ypos, ypos + overlay->image_height);
         break;
       case GST_VIDEO_FORMAT_RGBx:
-        gst_text_overlay_shade_RGBx (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
+        gst_text_overlay_shade_RGBx (overlay, data,
+            xpos, xpos + overlay->image_width,
             ypos, ypos + overlay->image_height);
         break;
       case GST_VIDEO_FORMAT_ARGB:
-        gst_text_overlay_shade_ARGB (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
+        gst_text_overlay_shade_ARGB (overlay, data,
+            xpos, xpos + overlay->image_width,
             ypos, ypos + overlay->image_height);
         break;
       case GST_VIDEO_FORMAT_ABGR:
-        gst_text_overlay_shade_ABGR (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
+        gst_text_overlay_shade_ABGR (overlay, data,
+            xpos, xpos + overlay->image_width,
             ypos, ypos + overlay->image_height);
         break;
       case GST_VIDEO_FORMAT_RGBA:
-        gst_text_overlay_shade_RGBA (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
+        gst_text_overlay_shade_RGBA (overlay, data,
+            xpos, xpos + overlay->image_width,
             ypos, ypos + overlay->image_height);
         break;
       case GST_VIDEO_FORMAT_BGRA:
-        gst_text_overlay_shade_BGRA (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
+        gst_text_overlay_shade_BGRA (overlay, data,
+            xpos, xpos + overlay->image_width,
             ypos, ypos + overlay->image_height);
         break;
       default:
@@ -2009,28 +2009,22 @@ gst_text_overlay_push_frame (GstTextOverlay * overlay, GstBuffer * video_frame)
         gst_text_overlay_blit_xRGB (overlay, data, xpos, ypos);
         break;
       case GST_VIDEO_FORMAT_RGBx:
-        gst_text_overlay_blit_RGBx (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, ypos);
+        gst_text_overlay_blit_RGBx (overlay, data, xpos, ypos);
         break;
       case GST_VIDEO_FORMAT_xBGR:
-        gst_text_overlay_blit_xBGR (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, ypos);
+        gst_text_overlay_blit_xBGR (overlay, data, xpos, ypos);
         break;
       case GST_VIDEO_FORMAT_ARGB:
-        gst_text_overlay_blit_ARGB (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, ypos);
+        gst_text_overlay_blit_ARGB (overlay, data, xpos, ypos);
         break;
       case GST_VIDEO_FORMAT_ABGR:
-        gst_text_overlay_blit_ABGR (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, ypos);
+        gst_text_overlay_blit_ABGR (overlay, data, xpos, ypos);
         break;
       case GST_VIDEO_FORMAT_RGBA:
-        gst_text_overlay_blit_RGBA (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, ypos);
+        gst_text_overlay_blit_RGBA (overlay, data, xpos, ypos);
         break;
       case GST_VIDEO_FORMAT_BGRA:
-        gst_text_overlay_blit_BGRA (overlay,
-            GST_BUFFER_DATA (video_frame), xpos, ypos);
+        gst_text_overlay_blit_BGRA (overlay, data, xpos, ypos);
         break;
       default:
         g_assert_not_reached ();
diff --git a/gst-libs/gst/tag/gstvorbistag.c b/gst-libs/gst/tag/gstvorbistag.c
index 9d86ee7244..6b6d8b6675 100644
--- a/gst-libs/gst/tag/gstvorbistag.c
+++ b/gst-libs/gst/tag/gstvorbistag.c
@@ -580,7 +580,7 @@ gst_tag_to_metadata_block_picture (const gchar * tag,
       &image_type, "width", G_TYPE_INT, &width, "height", G_TYPE_INT, &height,
       NULL);
 
-  metadata_block_len = 32 + mime_type_len + GST_BUFFER_SIZE (buffer);
+  metadata_block_len = 32 + mime_type_len + gst_buffer_get_size (buffer);
   gst_byte_writer_init_with_size (&writer, metadata_block_len, TRUE);
 
   if (image_type == GST_TAG_IMAGE_TYPE_NONE
diff --git a/tests/check/libs/video.c b/tests/check/libs/video.c
index 8af3c1da87..bea74988cf 100644
--- a/tests/check/libs/video.c
+++ b/tests/check/libs/video.c
@@ -429,8 +429,6 @@ GST_START_TEST (test_video_formats)
         fail_unless_equals_int (off1, (unsigned long) paintinfo.up);
         fail_unless_equals_int (off2, (unsigned long) paintinfo.vp);
 
-      skip_check:
-
         /* should be 0 if there's no alpha component */
         off3 = gst_video_format_get_component_offset (fmt, 3, w, h);
         fail_unless_equals_int (off3, (unsigned long) paintinfo.ap);