diff --git a/ChangeLog b/ChangeLog
index f48f250462..b1a04e8fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-16  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst/base/gstbasesrc.c: (gst_base_src_default_negotiate):
+	  some debug changes
+	* gst/gstmessage.h:
+	  typo fixes
+
 2005-11-16  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/base/gstbasesrc.c: (gst_base_src_init):
diff --git a/gst/base/gstbasesrc.c b/gst/base/gstbasesrc.c
index 5231e38974..f0a4701355 100644
--- a/gst/base/gstbasesrc.c
+++ b/gst/base/gstbasesrc.c
@@ -1174,20 +1174,20 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
 
   /* first see what is possible on our source pad */
   thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc));
-  GST_DEBUG ("caps of src: %" GST_PTR_FORMAT, thiscaps);
+  GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps);
   /* nothing or anything is allowed, we're done */
   if (thiscaps == NULL || gst_caps_is_any (thiscaps))
     goto no_nego_needed;
 
   /* get the peer caps */
   peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc));
-  GST_DEBUG ("caps of peer: %" GST_PTR_FORMAT, peercaps);
+  GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps);
   if (peercaps) {
     GstCaps *icaps;
 
     /* get intersection */
     icaps = gst_caps_intersect (thiscaps, peercaps);
-    GST_DEBUG ("intersect: %" GST_PTR_FORMAT, icaps);
+    GST_DEBUG_OBJECT (basesrc, "intersect: %" GST_PTR_FORMAT, icaps);
     gst_caps_unref (thiscaps);
     gst_caps_unref (peercaps);
     if (icaps) {
@@ -1205,7 +1205,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
 
     /* now fixate */
     gst_pad_fixate_caps (GST_BASE_SRC_PAD (basesrc), caps);
-    GST_DEBUG ("fixated to: %" GST_PTR_FORMAT, caps);
+    GST_DEBUG_OBJECT (basesrc, "fixated to: %" GST_PTR_FORMAT, caps);
 
     if (gst_caps_is_any (caps)) {
       /* hmm, still anything, so element can do anything and
@@ -1223,7 +1223,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
 
 no_nego_needed:
   {
-    GST_DEBUG ("no negotiation needed");
+    GST_DEBUG_OBJECT (basesrc, "no negotiation needed");
     if (thiscaps)
       gst_caps_unref (thiscaps);
     return TRUE;
diff --git a/gst/gstmessage.h b/gst/gstmessage.h
index b0e5e99ef4..6603f0c0d2 100644
--- a/gst/gstmessage.h
+++ b/gst/gstmessage.h
@@ -187,7 +187,7 @@ GQuark		gst_message_type_to_quark	(GstMessageType type);
  * gst_message_ref:
  * @msg: the message to ref
  *
- * Convinience macro to increase the reference count of the message. Returns the
+ * Convenience macro to increase the reference count of the message. Returns the
  * reffed message.
  */
 #define         gst_message_ref(msg)		GST_MESSAGE (gst_mini_object_ref (GST_MINI_OBJECT (msg)))
@@ -195,7 +195,7 @@ GQuark		gst_message_type_to_quark	(GstMessageType type);
  * gst_message_unref:
  * @msg: the message to unref
  *
- * Convinience macro to decrease the reference count of the message, possibly freeing
+ * Convenience macro to decrease the reference count of the message, possibly freeing
  * the it.
  */
 #define         gst_message_unref(msg)		gst_mini_object_unref (GST_MINI_OBJECT (msg))
diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index 5231e38974..f0a4701355 100644
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -1174,20 +1174,20 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
 
   /* first see what is possible on our source pad */
   thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc));
-  GST_DEBUG ("caps of src: %" GST_PTR_FORMAT, thiscaps);
+  GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps);
   /* nothing or anything is allowed, we're done */
   if (thiscaps == NULL || gst_caps_is_any (thiscaps))
     goto no_nego_needed;
 
   /* get the peer caps */
   peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc));
-  GST_DEBUG ("caps of peer: %" GST_PTR_FORMAT, peercaps);
+  GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps);
   if (peercaps) {
     GstCaps *icaps;
 
     /* get intersection */
     icaps = gst_caps_intersect (thiscaps, peercaps);
-    GST_DEBUG ("intersect: %" GST_PTR_FORMAT, icaps);
+    GST_DEBUG_OBJECT (basesrc, "intersect: %" GST_PTR_FORMAT, icaps);
     gst_caps_unref (thiscaps);
     gst_caps_unref (peercaps);
     if (icaps) {
@@ -1205,7 +1205,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
 
     /* now fixate */
     gst_pad_fixate_caps (GST_BASE_SRC_PAD (basesrc), caps);
-    GST_DEBUG ("fixated to: %" GST_PTR_FORMAT, caps);
+    GST_DEBUG_OBJECT (basesrc, "fixated to: %" GST_PTR_FORMAT, caps);
 
     if (gst_caps_is_any (caps)) {
       /* hmm, still anything, so element can do anything and
@@ -1223,7 +1223,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
 
 no_nego_needed:
   {
-    GST_DEBUG ("no negotiation needed");
+    GST_DEBUG_OBJECT (basesrc, "no negotiation needed");
     if (thiscaps)
       gst_caps_unref (thiscaps);
     return TRUE;