diff --git a/src/mcp/gm-mcp.c b/src/mcp/gm-mcp.c
index 7567704..bb9b7c9 100644
--- a/src/mcp/gm-mcp.c
+++ b/src/mcp/gm-mcp.c
@@ -5,9 +5,6 @@
 #include "gm-mcp.h"
 #include "../gm-support.h"
 
-#define MCP_MIN_VERSION 2.1
-#define MCP_MAX_VERSION 2.1
-
 gdouble
 gm_mcp_get_version(gdouble client_min, gdouble client_max, gdouble server_min,
 		gdouble server_max) {
@@ -106,14 +103,14 @@ gm_mcp_process_keyval(GList **info, gchar *line) {
 		return NULL;
 	}
 
-	keystart = line + 1;
+	keystart = ++line;
 	gm_string_skip_till(&line, ": ");
 	
 	if (*line != ':') {
 		return NULL;
 	}
 
-	keylen = line - keystart - 1;
+	keylen = line - keystart;
 	line = g_utf8_next_char(line);
 	
 	if (line[1] == '\0' || *line != ' ') {
@@ -121,7 +118,7 @@ gm_mcp_process_keyval(GList **info, gchar *line) {
 	}
 	
 	line = g_utf8_next_char(line);
-
+	
 	if (*line == ' ') {
 		return NULL;
 	}