diff --git a/weechat/weechat_otr.c b/weechat/weechat_otr.c
index 8feedd8..ac82032 100644
--- a/weechat/weechat_otr.c
+++ b/weechat/weechat_otr.c
@@ -23,7 +23,6 @@ WEECHAT_PLUGIN_NAME("irc-otr");
 WEECHAT_PLUGIN_DESCRIPTION("Off-The-Record Messaging for WeeChat");
 WEECHAT_PLUGIN_AUTHOR("Uli Meis <a.sporto+bee@gmail.com>");
 WEECHAT_PLUGIN_VERSION(IRCOTR_VERSION);
-WEECHAT_PLUGIN_WEECHAT_VERSION("unknown");
 WEECHAT_PLUGIN_LICENSE("GPL3");
 
 struct t_weechat_plugin *weechat_otr_plugin = NULL;
@@ -121,8 +120,8 @@ char *wc_modifier_privmsg_in(void *data, const char *modifier,
 
 	string = strdup(string);
 
-	argv = weechat_string_explode (string, " ", 0, 0, &argc);
-	argv_eol = weechat_string_explode (string, " ", 1, 0, NULL);
+	argv = weechat_string_split (string, " ", 0, 0, &argc);
+	argv_eol = weechat_string_split (string, " ", 1, 0, NULL);
 
 	if (!extract_nick(nick,argv[0]))
 		goto done;
@@ -158,8 +157,8 @@ char *wc_modifier_privmsg_in(void *data, const char *modifier,
 
 	string = strdup(cmsg);
 done:
-	weechat_string_free_exploded(argv);
-	weechat_string_free_exploded(argv_eol);
+	weechat_string_free_split(argv);
+	weechat_string_free_split(argv_eol);
 
 	return (char*)string;
 }
@@ -175,8 +174,8 @@ char *wc_modifier_privmsg_out(void *data, const char *modifier,
 	char s[256];
 	char *msg;
 
-	argv = weechat_string_explode (string, " ", 0, 0, &argc);
-	argv_eol = weechat_string_explode (string, " ", 1, 0, NULL);
+	argv = weechat_string_split (string, " ", 0, 0, &argc);
+	argv_eol = weechat_string_split (string, " ", 1, 0, NULL);
 
 	string = strdup(string);
 	
@@ -222,8 +221,8 @@ char *wc_modifier_privmsg_out(void *data, const char *modifier,
 	string = newmsg;
 
 done:
-	weechat_string_free_exploded(argv);
-	weechat_string_free_exploded(argv_eol);
+	weechat_string_free_split(argv);
+	weechat_string_free_split(argv_eol);
 
 	return (char*)string;
 }
diff --git a/weechat/weechat_otr.h b/weechat/weechat_otr.h
index 6b281de..4cff8dd 100644
--- a/weechat/weechat_otr.h
+++ b/weechat/weechat_otr.h
@@ -129,7 +129,7 @@ static void gsourceremovefake(struct t_hook *hook)
 gboolean keygen_complete(GIOChannel *source, GIOCondition condition, 
 			 gpointer data);
 
-static int cb(void *data)
+static int cb(void *data, int fd)
 {
 	keygen_complete(NULL,0,NULL);
 	return TRUE;