diff --git a/eek/eek-text.c b/eek/eek-text.c
index b4eae911..6604aed9 100644
--- a/eek/eek-text.c
+++ b/eek/eek-text.c
@@ -65,10 +65,9 @@ eek_text_real_deserialize (EekSerializable *self,
     EekTextPrivate *priv = EEK_TEXT_GET_PRIVATE(self);
 
     index = eek_text_parent_serializable_iface->deserialize (self,
-                                                               variant,
-                                                               index);
-
-    g_variant_get_child (variant, index++, "u", &priv->text);
+                                                             variant,
+                                                             index);
+    g_variant_get_child (variant, index++, "s", &priv->text);
 
     return index;
 }
diff --git a/eekboard/eekboard-0.90.pc.in b/eekboard/eekboard-0.90.pc.in
index 39d29b7c..00545e73 100644
--- a/eekboard/eekboard-0.90.pc.in
+++ b/eekboard/eekboard-0.90.pc.in
@@ -26,5 +26,5 @@ Description: A Library to Create Keyboard-like UI
 URL: http://ueno.github.com/eekboard/
 Version: @VERSION@
 Requires: eek-@EEK_API_VERSION@
-Libs: -L${libdir} -leek
+Libs: -L${libdir} -leekboard
 Cflags: -I${includedir}/eekboard-@EEK_API_VERSION@
diff --git a/eekboard/eekboard-context.h b/eekboard/eekboard-context.h
index 64c99f5a..7ce3cf12 100644
--- a/eekboard/eekboard-context.h
+++ b/eekboard/eekboard-context.h
@@ -106,7 +106,7 @@ void             eekboard_context_press_keycode  (EekboardContext *context,
 void             eekboard_context_release_keycode (EekboardContext *context,
                                                    guint            keycode,
                                                    GCancellable    *cancellable);
-gboolean         eekboard_context_is_keyboard_visible
+gboolean         eekboard_context_is_visible
                                                  (EekboardContext *context);
 void             eekboard_context_set_enabled    (EekboardContext *context,
                                                   gboolean         enabled);
diff --git a/src/client-main.c b/src/client-main.c
index 20dc42ff..060dfbeb 100644
--- a/src/client-main.c
+++ b/src/client-main.c
@@ -157,11 +157,20 @@ main (int argc, char **argv)
 
     switch (bus_type) {
     case G_BUS_TYPE_SYSTEM:
+        error = NULL;
+        connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
+        if (connection == NULL) {
+            g_printerr ("Can't connect to the system bus: %s\n",
+                        error->message);
+            exit (1);
+        }
+        break;
     case G_BUS_TYPE_SESSION:
         error = NULL;
         connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
         if (connection == NULL) {
-            g_printerr ("Can't connect to the bus: %s\n", error->message);
+            g_printerr ("Can't connect to the session bus: %s\n",
+                        error->message);
             exit (1);
         }
         break;