diff --git a/ChangeLog b/ChangeLog
index cd0d35b39c..3e7c86030b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/playback/gstplaybasebin.c: (gen_preroll_element):
+	  Increase buffer for video, decrease buffer for other media types.
+	* gst/playback/gstplaybin.c: (gen_video_element),
+	(gen_audio_element):
+	  Change names for debugging purposes.
+
 2005-05-18  Wim Taymans  <wim@fluendo.com>
 
 	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c
index 651c70b142..4da8314767 100644
--- a/gst/playback/gstplaybasebin.c
+++ b/gst/playback/gstplaybasebin.c
@@ -575,7 +575,8 @@ gen_preroll_element (GstPlayBaseBin * play_base_bin,
   name = g_strdup_printf ("preroll_%s_%s", prename, gst_pad_get_name (pad));
   preroll = gst_element_factory_make ("queue", name);
   g_object_set (G_OBJECT (preroll),
-      "max-size-buffers", 0, "max-size-bytes", 10 * 1024 * 1024,
+      "max-size-buffers", 0, "max-size-bytes",
+      ((type == GST_STREAM_TYPE_VIDEO) ? 25 : 1) * 1024 * 1024,
       "max-size-time", play_base_bin->queue_size, NULL);
   sig = g_signal_connect (G_OBJECT (preroll), "overrun",
       G_CALLBACK (queue_overrun), play_base_bin);
diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c
index 99f76c202e..9f51a8d46c 100644
--- a/gst/playback/gstplaybin.c
+++ b/gst/playback/gstplaybin.c
@@ -395,7 +395,7 @@ gen_video_element (GstPlayBin * play_bin)
   if (play_bin->video_sink) {
     sink = play_bin->video_sink;
   } else {
-    sink = gst_element_factory_make ("xvimagesink", "sink");
+    sink = gst_element_factory_make ("xvimagesink", "videosink");
   }
   gst_object_ref (GST_OBJECT (sink));
   g_hash_table_insert (play_bin->cache, "video_sink", sink);
@@ -507,7 +507,7 @@ gen_audio_element (GstPlayBin * play_bin)
   if (play_bin->audio_sink) {
     sink = play_bin->audio_sink;
   } else {
-    sink = gst_element_factory_make ("alsasink", "sink");
+    sink = gst_element_factory_make ("alsasink", "audiosink");
     play_bin->audio_sink = GST_ELEMENT (gst_object_ref (GST_OBJECT (sink)));
   }