diff --git a/clutter/eglnative/clutter-backend-egl.c b/clutter/eglnative/clutter-backend-egl.c
index d3c992e03..09eae2223 100644
--- a/clutter/eglnative/clutter-backend-egl.c
+++ b/clutter/eglnative/clutter-backend-egl.c
@@ -6,6 +6,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include <errno.h>
+
 #include "clutter-backend-egl.h"
 #include "clutter-stage-egl.h"
 
@@ -291,7 +293,7 @@ clutter_backend_egl_create_stage (ClutterBackend  *backend,
   stage_egl->backend = backend_egl;
   stage_egl->wrapper = wrapper;
 
-  backend_egl->stage = CLUTTER_ACTOR (stage_egl);
+  backend_egl->stage = stage;
 
   return stage;
 }
diff --git a/clutter/eglnative/clutter-backend-egl.h b/clutter/eglnative/clutter-backend-egl.h
index deb4e8a41..fe627fb1e 100644
--- a/clutter/eglnative/clutter-backend-egl.h
+++ b/clutter/eglnative/clutter-backend-egl.h
@@ -79,7 +79,7 @@ struct _ClutterBackendEGLClass
 
 GType clutter_backend_egl_get_type (void) G_GNUC_CONST;
 
-void _clutter_events_egl_init (ClutterBackendEGL *backend);
+void _clutter_events_egl_init   (ClutterBackendEGL *backend);
 void _clutter_events_egl_uninit (ClutterBackendEGL *backend);
 
 G_END_DECLS
diff --git a/clutter/eglnative/clutter-event-egl.c b/clutter/eglnative/clutter-event-egl.c
index 56732c4d4..d94cfe2c0 100644
--- a/clutter/eglnative/clutter-event-egl.c
+++ b/clutter/eglnative/clutter-event-egl.c
@@ -149,10 +149,8 @@ _clutter_events_egl_init (ClutterBackendEGL *backend_egl)
 }
 
 void
-_clutter_events_egl_uninit (ClutterBackend *backend)
+_clutter_events_egl_uninit (ClutterBackendEGL *backend_egl)
 {
-  ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend);
-
   if (backend_egl->event_timer != NULL)
     {
       CLUTTER_NOTE (EVENT, "Stopping the timer");
@@ -181,7 +179,6 @@ static gboolean
 clutter_event_prepare (GSource *source,
                        gint    *timeout)
 {
-  ClutterBackend *backend = ((ClutterEventSource *) source)->backend;
   gboolean retval;
 
   clutter_threads_enter ();
@@ -198,7 +195,6 @@ static gboolean
 clutter_event_check (GSource *source)
 {
   ClutterEventSource *event_source = (ClutterEventSource *) source;
-  ClutterBackend *backend = event_source->backend;
   gboolean retval;
 
   clutter_threads_enter ();
@@ -216,9 +212,8 @@ clutter_event_dispatch (GSource     *source,
                         GSourceFunc  callback,
                         gpointer     user_data)
 {
-  ClutterBackend     *backend = ((ClutterEventSource *) source)->backend;
   ClutterEventSource *event_source = (ClutterEventSource *) source;
-  ClutterEvent       *event;
+  ClutterEvent *event;
 #ifdef HAVE_TSLIB
   struct ts_sample    tsevent;
 #endif
@@ -233,7 +228,7 @@ clutter_event_dispatch (GSource     *source,
 #ifdef HAVE_TSLIB
   /* FIXME while would be better here but need to deal with lockups */
   if ((!clutter_events_pending()) &&
-        (ts_read(event_source->ts_device, &tsevent, 1) == 1))
+      (ts_read(event_source->ts_device, &tsevent, 1) == 1))
     {
       /* Avoid sending too many events which are just pressure changes.
        *