diff --git a/ChangeLog b/ChangeLog
index 9926fc5bd..4625b8c7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-30  Matthew Allum  <mallum@openedhand.com>
+
+	* clutter/clutter-event.h:
+	Removed unused POINTER_ENTER and POINTER_LEAVE states. (#546)
+	* clutter/clutter-stage.c: (clutter_stage_fullscreen),
+	(clutter_stage_unfullscreen):
+	Only Change fullscreen prop if the backend implements fullscreen
+	methods. (#545)
+
 2007-09-28  Øyvind Kolås  <pippin@openedhand.com>
 
 	* clutter/clutter-container.[ch]: added
diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h
index 38ee54297..8dda1f68e 100644
--- a/clutter/clutter-event.h
+++ b/clutter/clutter-event.h
@@ -85,9 +85,7 @@ typedef enum
 {
   CLUTTER_STAGE_STATE_FULLSCREEN       = (1<<1),
   CLUTTER_STAGE_STATE_OFFSCREEN        = (1<<2),
-  CLUTTER_STAGE_STATE_POINTER_ENTER    = (1<<3),
-  CLUTTER_STAGE_STATE_POINTER_LEAVE    = (1<<4),
-  CLUTTER_STAGE_STATE_ACTIVATED        = (1<<5),
+  CLUTTER_STAGE_STATE_ACTIVATED        = (1<<3)
 } ClutterStageState;
 
 typedef union _ClutterEvent ClutterEvent;
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index e49f5aad8..7f434a7cf 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -609,12 +609,13 @@ clutter_stage_fullscreen (ClutterStage *stage)
   priv = stage->priv;
   if (!priv->is_fullscreen)
     {
-      priv->is_fullscreen = TRUE;
-
+      /* Only set if backend implements */
       if (CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen)
-        CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen (stage, TRUE);
-
-      g_object_notify (G_OBJECT (stage), "fullscreen");
+	{
+	  priv->is_fullscreen = TRUE;
+	  CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen (stage, TRUE);
+	  g_object_notify (G_OBJECT (stage), "fullscreen");
+	}
     }
 }
 
@@ -638,12 +639,13 @@ clutter_stage_unfullscreen (ClutterStage *stage)
   priv = stage->priv;
   if (priv->is_fullscreen)
     {
-      priv->is_fullscreen = FALSE;
-
+      /* Only set if backend implements */
       if (CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen)
-        CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen (stage, FALSE);
-
-      g_object_notify (G_OBJECT (stage), "fullscreen");
+	{
+	  priv->is_fullscreen = FALSE;
+	  CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen (stage, FALSE);
+	  g_object_notify (G_OBJECT (stage), "fullscreen");
+	}
     }
 }