diff --git a/src/CWConfig.mak b/src/CWConfig.mak
index 1f71fdb0..d732e038 100644
--- a/src/CWConfig.mak
+++ b/src/CWConfig.mak
@@ -1,4 +1,4 @@
 include ../Config.mak
 
 WITH_GNUTLS=1
-WITH_OPENSSL=1
+WITH_OPENSSL=0
diff --git a/src/Config.mak b/src/Config.mak
index 96899acc..a8994f2a 100644
--- a/src/Config.mak
+++ b/src/Config.mak
@@ -28,7 +28,7 @@ COMPDEFS+=-DWITH_CW_LOG_DEBUG
 WITH_GNUTLS=1
 
 # Compile in openssl support
-WITH_OPENSSL=1
+WITH_OPENSSL=0
 
 # 
 # 
diff --git a/src/WtpConfig.mak b/src/WtpConfig.mak
index bcf8984e..2aa1d3b2 100644
--- a/src/WtpConfig.mak
+++ b/src/WtpConfig.mak
@@ -4,7 +4,7 @@ include ../Config.mak
 # Define witch SSL library to use
 # OPENSSL or GNUTLS
 #
-SSL_LIBRARY=OPENSSL
+SSL_LIBRARY=GNUTLS
 
 CFLAGS += -I/usr/include/libnl3
 CFLAGS += -I../contrib/uci
diff --git a/src/cw/cw_ktv_parser.c b/src/cw/cw_ktv_parser.c
index 544f2e60..9349ac5d 100644
--- a/src/cw/cw_ktv_parser.c
+++ b/src/cw/cw_ktv_parser.c
@@ -21,7 +21,7 @@ void cw_ktv_init_str_reader(struct cw_KTV_Reader *r, const char * str, int len)
 {
 	memset(r,0,sizeof(struct cw_KTV_Reader));
 	r->data = str;
-	r->getchar=str_getc;
+	r->xgetchar=str_getc;
 	r->ungetchar=str_ungetc;
 	r->maxlen=len;
 }
@@ -47,7 +47,7 @@ struct parser {
 static int get_char(struct cw_KTV_Reader *r)
 {
 	int c;
-	c = r->getchar (r);
+	c = r->xgetchar (r);
 	r->pos++;
 	if (c=='\n'){
 		r->prevpos=r->pos;
@@ -356,4 +356,4 @@ int cw_ktv_parse_string(struct cw_KTV_Reader *r, char *key, char *type, char *va
 	n = read_val(r,val,200);
 	return n;
 	
-}
\ No newline at end of file
+}
diff --git a/src/cw/ktv.h b/src/cw/ktv.h
index 8ae1b8db..4680d8d7 100644
--- a/src/cw/ktv.h
+++ b/src/cw/ktv.h
@@ -218,7 +218,7 @@ extern const cw_Type_t * cw_ktv_std_types[];
 
 struct cw_KTV_Reader {
 	const void * data;
-	int (*getchar)(struct cw_KTV_Reader *);
+	int (*xgetchar)(struct cw_KTV_Reader *);
 	void (*ungetchar)(struct cw_KTV_Reader *, int c);
 	int quote;
 	int line;
diff --git a/src/wtp/configure.c b/src/wtp/configure.c
index ae0334ef..3a64ddfe 100644
--- a/src/wtp/configure.c
+++ b/src/wtp/configure.c
@@ -37,7 +37,7 @@ int configure(struct conn * conn)
 	
 	cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,"Config ***","CFG: ", "End config ***");
 
-	cw_ktv_set_byte(conn->remote_cfg,"
+//	cw_ktv_set_byte(conn->remote_cfg,"
 exit(0);
 	return 1;
 }