diff --git a/src/include/lib3270/config.h.in b/src/include/lib3270/config.h.in
index 94fe822..492a7dd 100644
--- a/src/include/lib3270/config.h.in
+++ b/src/include/lib3270/config.h.in
@@ -38,12 +38,14 @@
 	#undef PACKAGE_REVISION
 
 	#undef HAVE_GNUC_VISIBILITY
-	#undef HAVE_ICONV
 	#undef HAVE_LIBM
 	#undef HAVE_LIBINTL
 	#undef HAVE_GETADDRINFO
 	#undef HAVE_SYSLOG
 
+	#undef HAVE_ICONV
+	#undef ICONV_CONST
+
 #ifdef WIN32
 	#undef HAVE_WIN_REGISTRY
 #endif // HAVE_WIN_REGISTRY
diff --git a/src/plugins/rx3270/rexx_methods.cc b/src/plugins/rx3270/rexx_methods.cc
index dd70bb2..2eaf851 100644
--- a/src/plugins/rx3270/rexx_methods.cc
+++ b/src/plugins/rx3270/rexx_methods.cc
@@ -205,7 +205,7 @@ RexxMethod2(int, rx3270_method_screen_trace, CSELF, sessionPtr, int, flag)
 
 }
 
-RexxMethod2(int, rx3270_method_data_trace, CSELF, sessionPtr, int, flag)
+RexxMethod2(int, rx3270_method_ds_trace, CSELF, sessionPtr, int, flag)
 {
 	rx3270 *hSession = (rx3270 *) sessionPtr;
 	if(!hSession)
@@ -214,7 +214,7 @@ RexxMethod2(int, rx3270_method_data_trace, CSELF, sessionPtr, int, flag)
 	return 0;
 }
 
-RexxMethod3(int, rx3270_method_set_toggle, CSELF, sessionPtr, CSTRING, name, int, flag)
+RexxMethod3(int, rx3270_method_set_option, CSELF, sessionPtr, CSTRING, name, int, flag)
 {
 	static const struct _toggle_info
 	{
diff --git a/src/plugins/rx3270/rx3270.cls b/src/plugins/rx3270/rx3270.cls
index c3b17d2..3f99b2d 100644
--- a/src/plugins/rx3270/rx3270.cls
+++ b/src/plugins/rx3270/rx3270.cls
@@ -51,9 +51,9 @@
 
 ::METHOD ENTER EXTERNAL "LIBRARY rx3270 rx3270_method_enter"
 ::METHOD PFKEY EXTERNAL "LIBRARY rx3270 rx3270_method_pfkey"
-::METHOD PFKEY EXTERNAL "LIBRARY rx3270 rx3270_method_pakey"
+::METHOD PAKEY EXTERNAL "LIBRARY rx3270 rx3270_method_pakey"
 
-::METHOD OPTION EXTERNAL "LIBRARY rx3270 rx3270_method_set_toggle"
+::METHOD OPTION EXTERNAL "LIBRARY rx3270 rx3270_method_set_option"
 ::METHOD EVENTTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_event_trace"
 ::METHOD SCREENTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_screen_trace"
 ::METHOD DSTRACE EXTERNAL "LIBRARY rx3270 rx3270_method_ds_trace"
diff --git a/src/plugins/rx3270/rx3270.h b/src/plugins/rx3270/rx3270.h
index f717050..748e5fd 100644
--- a/src/plugins/rx3270/rx3270.h
+++ b/src/plugins/rx3270/rx3270.h
@@ -91,8 +91,8 @@
  REXX_METHOD_PROTOTYPE(rx3270_method_cmp_text_at);
  REXX_METHOD_PROTOTYPE(rx3270_method_event_trace);
  REXX_METHOD_PROTOTYPE(rx3270_method_screen_trace);
- REXX_METHOD_PROTOTYPE(rx3270_method_data_trace);
- REXX_METHOD_PROTOTYPE(rx3270_method_set_toggle);
+ REXX_METHOD_PROTOTYPE(rx3270_method_ds_trace);
+ REXX_METHOD_PROTOTYPE(rx3270_method_set_option);
 
 /*---[ Globals ]---------------------------------------------------------------------------------------------*/
 
diff --git a/src/plugins/rx3270/rxapimain.cc b/src/plugins/rx3270/rxapimain.cc
index 47d6bd1..902595e 100644
--- a/src/plugins/rx3270/rxapimain.cc
+++ b/src/plugins/rx3270/rxapimain.cc
@@ -128,8 +128,8 @@ RexxMethodEntry rx3270_methods[] =
     REXX_METHOD(rx3270_method_cmp_text_at, 		rx3270_method_cmp_text_at		),
     REXX_METHOD(rx3270_method_event_trace, 		rx3270_method_event_trace		),
     REXX_METHOD(rx3270_method_screen_trace, 	rx3270_method_screen_trace		),
-    REXX_METHOD(rx3270_method_data_trace, 		rx3270_method_data_trace		),
-    REXX_METHOD(rx3270_method_set_toggle,		rx3270_method_set_toggle		),
+    REXX_METHOD(rx3270_method_ds_trace, 		rx3270_method_ds_trace			),
+    REXX_METHOD(rx3270_method_set_option,		rx3270_method_set_option		),
 
     REXX_LAST_METHOD()
 };
diff --git a/src/plugins/rx3270/text.cc b/src/plugins/rx3270/text.cc
index 22f6b79..62417a3 100644
--- a/src/plugins/rx3270/text.cc
+++ b/src/plugins/rx3270/text.cc
@@ -49,7 +49,7 @@ char * rx3270::get_3270_string(const char *str)
 
 		iconv(conv2Host,NULL,NULL,NULL,NULL);	// Reset state
 
-		if(iconv(conv2Host,&str,&in,&ptr,&out) == ((size_t) -1))
+		if(iconv(conv2Host,(ICONV_CONST char **) &str,&in,&ptr,&out) == ((size_t) -1))
 			ret = strdup((char *) str);
 		else
 			ret = strdup(buffer);
@@ -78,7 +78,7 @@ char * rx3270::get_local_string(const char *str)
 
 		iconv(conv2Local,NULL,NULL,NULL,NULL);	// Reset state
 
-		if(iconv(conv2Local,&str,&in,&ptr,&out) == ((size_t) -1))
+		if(iconv(conv2Local,(ICONV_CONST char **) &str,&in,&ptr,&out) == ((size_t) -1))
 			ret = strdup((char *) str);
 		else
 			ret = strdup(buffer);
--
libgit2 0.21.2