diff --git a/src/views/gcal-week-header.c b/src/views/gcal-week-header.c
index 15db96ae..42785164 100644
--- a/src/views/gcal-week-header.c
+++ b/src/views/gcal-week-header.c
@@ -21,11 +21,12 @@
 
 #define G_LOG_DOMAIN "GcalWeekHeader"
 
-#include "gcal-week-header.h"
-#include "gcal-week-view.h"
+#include "gcal-debug.h"
+#include "gcal-event-widget.h"
 #include "gcal-utils.h"
 #include "gcal-view.h"
-#include "gcal-event-widget.h"
+#include "gcal-week-header.h"
+#include "gcal-week-view.h"
 
 #include <glib/gi18n.h>
 #include <string.h>
@@ -1390,6 +1391,8 @@ gcal_week_header_drag_drop (GtkWidget      *widget,
   gboolean ltr;
   gint drop_cell;
 
+  GCAL_ENTRY;
+
   self = GCAL_WEEK_HEADER (widget);
   ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
   drop_cell = get_dnd_cell (widget, x, y);
@@ -1462,7 +1465,7 @@ gcal_week_header_drag_drop (GtkWidget      *widget,
 
   gtk_widget_queue_draw (widget);
 
-  return TRUE;
+  GCAL_RETURN (TRUE);
 }
 
 static void
diff --git a/src/views/gcal-week-view.c b/src/views/gcal-week-view.c
index 42fc2a2c..92abc470 100644
--- a/src/views/gcal-week-view.c
+++ b/src/views/gcal-week-view.c
@@ -302,12 +302,16 @@ gcal_week_view_component_added (ECalDataModelSubscriber *subscriber,
 
   GcalEvent *event;
 
+  GCAL_ENTRY;
+
   event = gcal_event_new (e_client_get_source (E_CLIENT (client)), comp, NULL);
 
   if (gcal_event_is_multiday (event) || gcal_event_get_all_day (event))
     gcal_week_header_add_event (GCAL_WEEK_HEADER (self->header), event);
   else
     gcal_week_grid_add_event (GCAL_WEEK_GRID (self->week_grid), event);
+
+  GCAL_EXIT;
 }
 
 static void
@@ -319,6 +323,8 @@ gcal_week_view_component_modified (ECalDataModelSubscriber *subscriber,
   GcalWeekHeader *header;
   gchar *uuid;
 
+  GCAL_ENTRY;
+
   header = GCAL_WEEK_HEADER (self->header);
 
   uuid = get_uuid_from_component (e_client_get_source (E_CLIENT (client)), comp);
@@ -329,6 +335,8 @@ gcal_week_view_component_modified (ECalDataModelSubscriber *subscriber,
   gcal_week_view_component_added (subscriber, client, comp);
 
   g_free (uuid);
+
+  GCAL_EXIT;
 }
 
 static void
@@ -341,6 +349,8 @@ gcal_week_view_component_removed (ECalDataModelSubscriber *subscriber,
   ESource *source;
   gchar *uuid;
 
+  GCAL_ENTRY;
+
   source = e_client_get_source (E_CLIENT (client));
 
   if (rid != NULL)
@@ -352,6 +362,8 @@ gcal_week_view_component_removed (ECalDataModelSubscriber *subscriber,
   gcal_week_grid_remove_event (GCAL_WEEK_GRID (self->week_grid), uuid);
 
   g_free (uuid);
+
+  GCAL_EXIT;
 }
 
 static void