diff --git a/ChangeLog b/ChangeLog
index d4eba8bafa..d4ec988f60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-12  David Schleef  <ds@schleef.org>
+
+	* gst/gstcaps.h: jdahlin, what are you smoking?  We can't just
+	change API right now!  Readd gst_caps_is_simple() macro.
+	* gst/gstelement.c: (gst_element_base_class_finalize): Fix
+	uninitialized variable.  I'd bet this caused crashes.
+	* gst/gstinfo.c: (gst_debug_print_object):  Fix 64-bit cleanliness.
+
 2004-03-12  Johan Dahlin  <johan@gnome.org>
 
 	* gst/gstcaps.h (GST_CAPS_IS_SIMPLE): Capitalize macro
diff --git a/gst/gstcaps.h b/gst/gstcaps.h
index 51adeda230..65f4e71ccf 100644
--- a/gst/gstcaps.h
+++ b/gst/gstcaps.h
@@ -38,6 +38,7 @@ G_BEGIN_DECLS
 #define GST_STATIC_CAPS_NONE      GST_STATIC_CAPS("NONE")
 
 #define GST_CAPS_IS_SIMPLE(caps) (gst_caps_get_size(caps) == 1)
+#define gst_caps_is_simple(caps) GST_CAPS_IS_SIMPLE(caps)
 
 #ifndef GST_DISABLE_DEPRECATED
 #define GST_DEBUG_CAPS(string, caps) \
diff --git a/gst/gstelement.c b/gst/gstelement.c
index d6c6788a09..f52d7674c2 100644
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -180,7 +180,7 @@ gst_element_base_class_init (gpointer g_class)
 static void
 gst_element_base_class_finalize (gpointer g_class)
 {
-  GstElementClass *klass = GST_ELEMENT_CLASS (klass);
+  GstElementClass *klass = GST_ELEMENT_CLASS (g_class);
 
   g_list_foreach (klass->padtemplates, (GFunc) g_object_unref, NULL);
   g_list_free (klass->padtemplates);
diff --git a/gst/gstinfo.c b/gst/gstinfo.c
index 5704bf0cf8..3579f27dc7 100644
--- a/gst/gstinfo.c
+++ b/gst/gstinfo.c
@@ -374,7 +374,7 @@ gst_debug_print_object (gpointer ptr)
     return gst_structure_to_string ((GstStructure *)ptr);
   }
 #ifdef USE_POISONING
-  if (*(int *)ptr == 0xffffffff) {
+  if (*(guint32 *)ptr == 0xffffffff) {
     return g_strdup_printf ("<poisoned@%p>", ptr);
   }
 #endif