diff --git a/README.md b/README.md
index 97e3b46..1ee68dd 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,13 @@ To run the daemon use
 ```sh
 _build/run
 ```
+
+To run under gdb use
+
+``` sh
+FBD_GDB=1 _build/run
+```
+
 You can introspect and get the current theme with
 
 ```sh
diff --git a/run.in b/run.in
index 21e1e10..2e665ea 100755
--- a/run.in
+++ b/run.in
@@ -8,5 +8,10 @@ FEEDBACK_THEME=${FEEDBACK_THEME:-"${ABS_SRCDIR}/data/default.json"}
 export FEEDBACK_THEME
 export GSETTINGS_SCHEMA_DIR="${ABS_BUILDDIR}/data"
 
+if [ "${FBD_GDB}" = 1 ]; then
+    echo "Running calls under gdb"
+    WRAPPER="gdb --args"
+fi
+
 set -x
-exec "${ABS_BUILDDIR}/src/feedbackd" "$@"
+exec ${WRAPPER} "${ABS_BUILDDIR}/src/feedbackd" "$@"
diff --git a/src/fbd-feedback-manager.c b/src/fbd-feedback-manager.c
index bddb01b..dbcf08d 100644
--- a/src/fbd-feedback-manager.c
+++ b/src/fbd-feedback-manager.c
@@ -323,7 +323,7 @@ fbd_feedback_manager_handle_trigger_feedback (LfbGdbusFeedback      *object,
   FbdFeedbackManager *self;
   FbdEvent *event;
   GSList *feedbacks, *l;
-  gint event_id;
+  guint event_id;
   const gchar *sender;
   FbdFeedbackProfileLevel app_level, level, hint_level = FBD_FEEDBACK_PROFILE_LEVEL_FULL;
   gboolean found_fb = FALSE;