diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 039fff4e0..44756e8ad 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -2833,7 +2833,7 @@ clutter_actor_event (ClutterActor *actor,
   g_return_val_if_fail (event != NULL, FALSE);
 
   g_object_ref (actor);
-
+  
   g_signal_emit (actor, actor_signals[EVENT], 0, event);
   
   switch (event->type)
diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c
index e0650fc10..3b2c41814 100644
--- a/clutter/clutter-event.c
+++ b/clutter/clutter-event.c
@@ -154,12 +154,17 @@ clutter_event_get_coords (ClutterEvent *event,
 
   switch (event->type)
     {
+    case CLUTTER_NOTHING:
     case CLUTTER_KEY_PRESS:
     case CLUTTER_KEY_RELEASE:
-      event_x = event_y = 0;
+    case CLUTTER_STAGE_STATE:
+    case CLUTTER_DESTROY_NOTIFY:
+    case CLUTTER_CLIENT_MESSAGE:
+    case CLUTTER_DELETE:
       break;
     case CLUTTER_BUTTON_PRESS:
     case CLUTTER_2BUTTON_PRESS:
+    case CLUTTER_3BUTTON_PRESS:
     case CLUTTER_BUTTON_RELEASE:
       event_x = event->button.x;
       event_y = event->button.y;
@@ -172,8 +177,6 @@ clutter_event_get_coords (ClutterEvent *event,
       event_x = event->scroll.x;
       event_y = event->scroll.y;
       break;
-    default:
-      break;
     }
 
   if (x)
@@ -440,6 +443,7 @@ clutter_event_get (void)
       if (!(event->flags & CLUTTER_EVENT_PENDING))
         {
           g_queue_remove (context->events_queue, event);
+
           return (ClutterEvent *) event;
         }
 
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 28d8a65f4..b56fe4739 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -273,7 +273,7 @@ clutter_do_event (ClutterEvent *event)
 				  x, y, 
 				  CLUTTER_PICK_REACTIVE);
 
-	CLUTTER_NOTE (EVENT, "Reactive event recieved at %ix%i - actor: %p", 
+	CLUTTER_NOTE (EVENT, "Reactive event received at %i, %i - actor: %p", 
 		      x, y, actor);
 
 	if (event->type == CLUTTER_SCROLL)
@@ -303,14 +303,14 @@ clutter_do_event (ClutterEvent *event)
 	 */
 	while (actor)
 	  {
-	    if (clutter_actor_is_reactive (actor)
-		|| clutter_actor_get_parent(actor) == NULL /* STAGE */ )
+	    if (clutter_actor_is_reactive (actor) ||
+                clutter_actor_get_parent (actor) == NULL /* STAGE */ )
 	      {
 		CLUTTER_NOTE (EVENT, "forwarding event to reactive actor");
 		clutter_actor_event (actor, event);
 	      }
 
-	    actor = clutter_actor_get_parent(actor);
+	    actor = clutter_actor_get_parent (actor);
 	  }
       }
       break;