diff --git a/ChangeLog b/ChangeLog
index b83fe6be53..8790482ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-24  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* check/Makefile.am:
+	  Add CHECK_CFLAGS and LDFLAGS
+
+	* gst/playback/gstplaybasebin.c: (fill_buffer):
+	  GST_MESSAGE_SRC became a GObject
+
 2005-08-24  Wim Taymans  <wim@fluendo.com>
 
 	* gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_set_sample),
diff --git a/check/Makefile.am b/check/Makefile.am
index 19f7666bb4..705e4f6a44 100644
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -32,8 +32,8 @@ check_PROGRAMS = \
 	elements/volume \
 	$(check_vorbis)
 
-AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS)
-LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS)
+AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
+LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 
 # valgrind testing
 VALGRIND_TESTS_DISABLE = 			\
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 6ffca4e07c..2477f439c3 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -439,7 +439,7 @@ fill_buffer (GstPlayBaseBin * play_base_bin, gint percent)
 {
   gst_element_post_message (GST_ELEMENT (play_base_bin),
       gst_message_new_custom (GST_MESSAGE_BUFFERING,
-          GST_OBJECT (play_base_bin),
+          G_OBJECT (play_base_bin),
           gst_structure_new ("GstMessageBuffering",
               "buffer-percent", G_TYPE_INT, percent, NULL)));
 }
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 19f7666bb4..705e4f6a44 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -32,8 +32,8 @@ check_PROGRAMS = \
 	elements/volume \
 	$(check_vorbis)
 
-AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS)
-LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS)
+AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
+LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
 
 # valgrind testing
 VALGRIND_TESTS_DISABLE = 			\