diff --git a/ChangeLog b/ChangeLog
index c9f4713bd..2bec60f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-25  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-stage.c:
+	(clutter_stage_allocate): Minor optimization.
+
+	(clutter_stage_init): Do not set the minimum size of the
+	stage wrapper, and require that the backends set the size
+	themselves.
+
 2008-06-25  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/eglnative/clutter-stage-egl.c:
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 0fa0e6103..51163213b 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -164,7 +164,7 @@ clutter_stage_allocate (ClutterActor          *self,
    * then we simply ignore any allocation request and override the
    * allocation chain.
    */
-  if (!clutter_feature_available (CLUTTER_FEATURE_STAGE_STATIC))
+  if (G_LIKELY (!clutter_feature_available (CLUTTER_FEATURE_STAGE_STATIC)))
     {
       ClutterActorClass *klass;
 
@@ -718,7 +718,6 @@ clutter_stage_init (ClutterStage *self)
   priv->fog.z_near  = CLUTTER_FLOAT_TO_FIXED (1.0);
   priv->fog.z_far   = CLUTTER_FLOAT_TO_FIXED (2.0);
 
-  clutter_actor_set_size (CLUTTER_ACTOR (self), 640, 480);
   clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
   clutter_stage_set_key_focus (self, NULL);
 }