diff --git a/eekboard/eekboard-context.c b/eekboard/eekboard-context.c
index 9cffd3fc..6ecc78d8 100644
--- a/eekboard/eekboard-context.c
+++ b/eekboard/eekboard-context.c
@@ -151,7 +151,7 @@ eekboard_context_real_destroyed (EekboardContext *self)
 
 static void
 eekboard_context_real_key_activated (EekboardContext *self,
-                                     const gchar     *keyname,
+                                     guint            keycode,
                                      EekSymbol       *symbol,
                                      guint            modifiers)
 {
diff --git a/src/client-main.c b/src/client-main.c
index 6087943e..28cde9ec 100644
--- a/src/client-main.c
+++ b/src/client-main.c
@@ -37,7 +37,9 @@ static gboolean opt_session = FALSE;
 static gchar *opt_address = NULL;
 
 static gboolean opt_focus = FALSE;
+#ifdef HAVE_ATSPI
 static gboolean opt_keystroke = FALSE;
+#endif  /* HAVE_ATSPI */
 
 static gchar *opt_keyboards = NULL;