diff --git a/latest/Makefile.in b/latest/Makefile.in
index de291af..b305ccc 100644
--- a/latest/Makefile.in
+++ b/latest/Makefile.in
@@ -358,7 +358,7 @@ Debug:	$(BINDIR)/Debug/$(PACKAGE_NAME)@EXEEXT@ \
 	$(foreach LIB, $(LIBRARIES), $(BINDIR)/Debug/$(LIB)@DLLEXT@)
 
 run: Debug
-	@PATH="$(PATH):.bin/Debug/lib" $(BINDIR)/Debug/$(PACKAGE_NAME)@EXEEXT@ --program-data="$(PWD)" --model=5 --plugin-path=$(BINDIR)/Debug/plugins
+	@PATH="$(PATH):.bin/Debug/lib" $(BINDIR)/Debug/$(PACKAGE_NAME)@EXEEXT@ --program-data="$(PWD)" --plugin-path=$(BINDIR)/Debug/plugins
 
 distclean: clean
 	@$(MAKE) -C src/lib distclean
diff --git a/latest/src/gtk2/actions1.c b/latest/src/gtk2/actions1.c
index a92be77..9a2bfb0 100644
--- a/latest/src/gtk2/actions1.c
+++ b/latest/src/gtk2/actions1.c
@@ -32,6 +32,7 @@
 
  #include <lib3270/config.h>
  #include <gdk/gdk.h>
+ #include <stdlib.h>
 
  #include "gui.h"
  #include "fonts.h"
@@ -755,7 +756,7 @@
 	gtk_action_group_set_sensitive(action_group[id],status);
  }
 
- static void set_ft_action_state(int state)
+ static void set_ft_action_state(H3270 *session,int state)
  {
 	gtk_action_group_set_sensitive(action_group[ACTION_GROUP_FT],state);
  }
@@ -789,7 +790,7 @@
 		action_by_id[f] = dunno;
 
 #ifdef 	X3270_FT
-	set_ft_action_state(0);
+	set_ft_action_state(hSession,0);
 	register_schange(ST_3270_MODE, set_ft_action_state);
 #else
 	gtk_action_group_set_sensitive(ft_actions,FALSE);
diff --git a/latest/src/gtk2/main.c b/latest/src/gtk2/main.c
index 53d8b93..042d10b 100644
--- a/latest/src/gtk2/main.c
+++ b/latest/src/gtk2/main.c
@@ -76,7 +76,7 @@ static gchar		* log_filename		= NULL;
 /*---[ Implement ]----------------------------------------------------------------------------------------------*/
 
 /* Callback for connection state changes. */
-static void connect_main(int status)
+static void connect_main(H3270 *session, int status)
 {
 	gboolean online = (CONNECTED) ? TRUE : FALSE;
 
@@ -129,7 +129,7 @@ static void connect_main(int status)
 
 }
 
-static void connect_in3270(int status)
+static void connect_in3270(H3270 *session, int status)
 {
 #ifdef X3270_FT
 	action_group_set_sensitive(ACTION_GROUP_FT,status);
@@ -290,17 +290,17 @@ static int program_init(void)
 		g_free(ptr);
 	}
 
-	Trace("%s","Opening configuration file");
+//	Trace("%s","Opening configuration file");
 	if(Register3270IOCallbacks(&program_io_callbacks))
 		return show_lib3270_register_error(_( "Can't register as I/O manager." ));
 
-	Trace("%s","Setting screen callbacks");
+//	Trace("%s","Setting screen callbacks");
 	if(Register3270ScreenCallbacks(&program_screen_callbacks))
 		return show_lib3270_register_error(_( "Can't register as screen manager." ));
 
 
 #ifdef X3270_FT
-	Trace("%s","Starting FT feature");
+//	Trace("%s","Starting FT feature");
 	if(initft())
 		return show_lib3270_register_error(_( "Can't register as file-transfer manager." ));
 #endif
@@ -585,7 +585,7 @@ int main(int argc, char *argv[])
 	LoadPlugins();
 
 	Trace("Initializing library with %s...",argv[0]);
-	hSession = new_3270_session();
+	hSession = new_3270_session(GetString("Terminal","Model",""));
 
 	if(rc)
 	{
@@ -622,8 +622,8 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	connect_main(0);
-	connect_in3270(0);
+	connect_main(hSession,0);
+	connect_in3270(hSession,0);
 
 	register_schange(ST_CONNECT, connect_main);
 	register_schange(ST_3270_MODE, connect_in3270);
diff --git a/latest/src/gtk2/screen.c b/latest/src/gtk2/screen.c
index 3ed7a16..ec66452 100644
--- a/latest/src/gtk2/screen.c
+++ b/latest/src/gtk2/screen.c
@@ -821,6 +821,7 @@
 	if(gtk_check_menu_item_get_active(item))
 	{
 		Trace("Screen size set to %d",id);
+		SetInt("Terminal","Model",id);
 		set_3270_model(hSession,id);
 	}
  }
diff --git a/latest/src/include/lib3270/api.h b/latest/src/include/lib3270/api.h
index 17d661b..c3b3d16 100644
--- a/latest/src/include/lib3270/api.h
+++ b/latest/src/include/lib3270/api.h
@@ -446,7 +446,7 @@
 
 		LIB3270_EXPORT int Register3270ScreenCallbacks(const struct lib3270_screen_callbacks *cbk);
 
-		LIB3270_EXPORT H3270 * new_3270_session(void);
+		LIB3270_EXPORT H3270 * new_3270_session(const char *model);
 
 		LIB3270_EXPORT const struct lib3270_option * get_3270_option_table(int sz);
 
@@ -531,7 +531,7 @@
 		LIB3270_EXPORT int host_connect(const char *n, int wait);
 		LIB3270_EXPORT int host_reconnect(int wait);
 		LIB3270_EXPORT void host_disconnect(H3270 *h, int disable);
-		LIB3270_EXPORT void register_schange(LIB3270_STATE_CHANGE tx, void (*func)(int));
+		LIB3270_EXPORT void register_schange(LIB3270_STATE_CHANGE tx, void (*func)(H3270 *, int));
 
 		/* Console/Trace window */
 		LIB3270_EXPORT HCONSOLE	  console_window_new(const char *title, const char *label);
diff --git a/latest/src/jni/pw3270_jni.c b/latest/src/jni/pw3270_jni.c
index 0b0cf60..5232675 100644
--- a/latest/src/jni/pw3270_jni.c
+++ b/latest/src/jni/pw3270_jni.c
@@ -100,7 +100,7 @@ int lib3270_jni_init(void)
 	Trace("Running %s on %s %s %s (pid: %d)",__FUNCTION__,__FILE__,__DATE__,__TIME__,getpid());
 #endif
 
-	hSession = new_3270_session();
+	hSession = new_3270_session("");
     Trace("%s ends",__FUNCTION__);
 	return 0;
 }
diff --git a/latest/src/lib/ansi.c b/latest/src/lib/ansi.c
index 8256d2a..d693734 100644
--- a/latest/src/lib/ansi.c
+++ b/latest/src/lib/ansi.c
@@ -1683,7 +1683,7 @@ ansi_scroll(void)
 
 /* Callback for when we enter ANSI mode. */
 static void
-ansi_in3270(int in3270)
+ansi_in3270(H3270 *session, int in3270)
 {
 	if (!in3270)
 		(void) ansi_reset(0, 0);
diff --git a/latest/src/lib/ctlr.c b/latest/src/lib/ctlr.c
index 8016432..3c43984 100644
--- a/latest/src/lib/ctlr.c
+++ b/latest/src/lib/ctlr.c
@@ -72,11 +72,8 @@ extern unsigned char aid;
 
 /* Globals */
 int				ROWS, COLS;
-// int				ov_rows, ov_cols;
-
 int				maxROWS		= 0;
 int				maxCOLS		= 0;
-// int				model_num	= -1;
 
 int				cursor_addr, buffer_addr;
 Boolean         screen_alt = False;	/* alternate screen? */
@@ -102,8 +99,8 @@ static unsigned char default_bg;
 static unsigned char default_gr;
 static unsigned char default_cs;
 static unsigned char default_ic;
-static void	ctlr_half_connect(int ignored);
-static void	ctlr_connect(int ignored);
+static void	ctlr_half_connect(H3270 *session, int ignored);
+static void	ctlr_connect(H3270 *session, int ignored);
 static int	sscp_start;
 static void ticking_stop(void);
 static void ctlr_add_ic(int baddr, unsigned char ic);
@@ -131,20 +128,6 @@ static unsigned char	code_table[64] = {
 #define REGION_CHANGED(f, l) if(IN_ANSI) changed(&h3270,f,l)
 #define ONE_CHANGED(n)	if(IN_ANSI) changed(&h3270,n,n+1);
 
-/*
-#define ALL_CHANGED	{ \
-	screen_changed(0,ROWS*COLS); \
-	if (IN_ANSI) { first_changed = 0; last_changed = ROWS*COLS; } }
-
-#define REGION_CHANGED(f, l)	{ \
-	screen_changed(f,l); \
-	if (IN_ANSI) { \
-	    if (first_changed == -1 || f < first_changed) first_changed = f; \
-	    if (last_changed == -1 || l > last_changed) last_changed = l; } }
-
-#define ONE_CHANGED(n)	REGION_CHANGED(n, n+1)
-*/
-
 #define DECODE_BADDR(c1, c2) \
 	((((c1) & 0xC0) == 0x00) ? \
 	(((c1) & 0x3F) << 8) | (c2) : \
@@ -175,8 +158,7 @@ ctlr_init(unsigned cmask unused)
 /*
  * Reinitialize the emulated 3270 hardware.
  */
-void
-ctlr_reinit(unsigned cmask)
+void ctlr_reinit(H3270 *session, unsigned cmask)
 {
 	static struct ea *real_ea_buf = NULL;
 	static struct ea *real_aea_buf = NULL;
@@ -222,7 +204,7 @@ int	set_3270_model(H3270 *session, int model)
 		return EBUSY;
 
 	ctlr_set_rows_cols(session,model,session->ov_cols,session->ov_rows);
-	ctlr_reinit(MODEL_CHANGE);
+	ctlr_reinit(session,MODEL_CHANGE);
 	return 0;
 }
 
@@ -300,7 +282,7 @@ set_formatted(void)
  * Called when a host is half connected.
  */
 static void
-ctlr_half_connect(int ignored unused)
+ctlr_half_connect(H3270 *session, int ignored unused)
 {
 	ticking_start(True);
 }
@@ -310,7 +292,7 @@ ctlr_half_connect(int ignored unused)
  * Called when a host connects, disconnects, or changes ANSI/3270 modes.
  */
 static void
-ctlr_connect(int ignored unused)
+ctlr_connect(H3270 *session, int ignored unused)
 {
 	ticking_stop();
 	status_untiming();
diff --git a/latest/src/lib/ctlrc.h b/latest/src/lib/ctlrc.h
index 6ee244f..6dd529a 100644
--- a/latest/src/lib/ctlrc.h
+++ b/latest/src/lib/ctlrc.h
@@ -40,7 +40,7 @@ LIB3270_INTERNAL void ctlr_erase_all_unprotected(void);
 LIB3270_INTERNAL void ctlr_init(unsigned cmask);
 LIB3270_INTERNAL void ctlr_read_buffer(unsigned char aid_byte);
 LIB3270_INTERNAL void ctlr_read_modified(unsigned char aid_byte, Boolean all);
-LIB3270_INTERNAL void ctlr_reinit(unsigned cmask);
+LIB3270_INTERNAL void ctlr_reinit(H3270 *session, unsigned cmask);
 LIB3270_INTERNAL void ctlr_scroll(void);
 LIB3270_INTERNAL void ctlr_shrink(void);
 LIB3270_INTERNAL void ctlr_snap_buffer(void);
diff --git a/latest/src/lib/ft.c b/latest/src/lib/ft.c
index 073e394..808ad2e 100644
--- a/latest/src/lib/ft.c
+++ b/latest/src/lib/ft.c
@@ -57,8 +57,8 @@
 #include "telnetc.h"
 #include "utilc.h"
 
-static void ft_connected(int ignored);
-static void ft_in3270(int ignored unused);
+static void ft_connected(H3270 *session, int ignored);
+static void ft_in3270(H3270 *session, int ignored unused);
 
 /* Macros. */
 #define eos(s)	strchr((s), '\0')
@@ -372,14 +372,14 @@ ft_aborting(void)
 }
 
 /* Process a disconnect abort. */
-static void ft_connected(int ignored)
+static void ft_connected(H3270 *session, int ignored)
 {
 	if (!CONNECTED && ft_state != FT_NONE)
 		ft_complete(MSG_("ftDisconnected","Host disconnected, transfer cancelled"));
 }
 
 /* Process an abort from no longer being in 3270 mode. */
-static void ft_in3270(int ignored)
+static void ft_in3270(H3270 *session, int ignored)
 {
 	if (!IN_3270 && ft_state != FT_NONE)
 		ft_complete(MSG_("ftNot3270","Not in 3270 mode, transfer cancelled"));
diff --git a/latest/src/lib/glue.c b/latest/src/lib/glue.c
index f06b375..fa829cb 100644
--- a/latest/src/lib/glue.c
+++ b/latest/src/lib/glue.c
@@ -100,20 +100,19 @@
 
  #define LAST_ARG	"--"
 
-/* Statics */
-static int parse_model_number(char *m);
-
-/* Globals */
-H3270			h3270;
-const char		*programname;
-// char			full_model_name[FULL_MODEL_NAME_SIZE] = "IBM-";
-//char			*model_name = &full_model_name[4];
-AppRes			appres;
-int				children = 0;
-Boolean			exiting = False;
-char			*command_string = CN;
-static Boolean	sfont = False;
-Boolean			*standard_font = &sfont;
+/*---[ Statics ]--------------------------------------------------------------------------------------------------------------*/
+
+ static int parse_model_number(const char *m);
+
+/*---[ Globals ]--------------------------------------------------------------------------------------------------------------*/
+ H3270				  h3270;
+ const char		* programname;
+ AppRes				  appres;
+ int				  children = 0;
+ Boolean			  exiting = False;
+// char				* command_string = CN;
+ static Boolean	  sfont = False;
+ Boolean			* standard_font = &sfont;
 
 #if defined(WC3270) || defined(LIB3270)/*[*/
 char			*profile_name = CN;
@@ -150,10 +149,12 @@ const char *toggle_names[N_TOGGLES] =
  * This function will create and initialize a new 3270 session, but, now
  * it just returns a static 3270 session structure.
  *
+ * @param model	Terminal model (Can be overrided by command-line options
+ *
  * @return lib3270 internal session structure.
  *
  */
-H3270 * new_3270_session(void)
+H3270 * new_3270_session(const char *model)
 {
 	static int configured = 0;
 
@@ -198,12 +199,17 @@ H3270 * new_3270_session(void)
 	/*
 	 * Sort out model and color modes, based on the model number resource.
 	 */
+	if(*appres.model)
+		model = appres.model;
 
-	Trace("Parsing model: %s",appres.model);
-	model_number = parse_model_number(appres.model);
+	if(!*model)
+		model = "2";	// No model, use the default one
+
+//	Trace("Parsing model: %s",appres.model);
+	model_number = parse_model_number(model);
 	if (model_number < 0)
 	{
-		popup_an_error("Invalid model number: %s", appres.model);
+		popup_an_error("Invalid model number: %s", model);
 		model_number = 0;
 	}
 
@@ -254,7 +260,7 @@ H3270 * new_3270_session(void)
 		(void) charset_init(CN);
 	}
 
-	if(screen_init())
+	if(screen_init(hSession))
 		return NULL;
 
 	kybd_init();
@@ -325,7 +331,7 @@ static void initialize(void)
 	appres.compose_map = "latin1";
 #endif /*]*/
 
-	appres.model = "2";
+	appres.model = "";
 	appres.hostsfile = CN;
 	appres.port = "telnet";
 
@@ -515,8 +521,7 @@ const struct lib3270_option * get_3270_option_table(int sz)
  * Parse the model number.
  * Returns -1 (error), 0 (default), or the specified number.
  */
-static int
-parse_model_number(char *m)
+static int parse_model_number(const char *m)
 {
 	int sl;
 	int n;
@@ -645,7 +650,7 @@ static struct {
 #endif /*]*/
 	{ ResLoginMacro,offset(login_macro),	XRM_STRING },
 	{ ResM3279,	offset(m3279),		XRM_BOOLEAN },
-	{ ResModel,	offset(model),		XRM_STRING },
+//	{ ResModel,	offset(model),		XRM_STRING },
 	{ ResModifiedSel, offset(modified_sel),	XRM_BOOLEAN },
 #if defined(C3270) && !defined(_WIN32) /*[*/
 	{ ResMono,	offset(mono),		XRM_BOOLEAN },
diff --git a/latest/src/lib/host.c b/latest/src/lib/host.c
index ae18919..33920f9 100644
--- a/latest/src/lib/host.c
+++ b/latest/src/lib/host.c
@@ -972,22 +972,26 @@ save_recent(const char *hn)
 
 /* Support for state change callbacks. */
 
-struct st_callback {
-	struct st_callback *next;
-	void (*func)(int);
+struct st_callback
+{
+	struct st_callback	* next;					/**< Next callback in chain */
+	H3270				* session;				/**< Session owning this callback */
+	void 				  (*func)(H3270 *,int);	/**< Callback method */
 };
 static struct st_callback *st_callbacks[N_ST];
 static struct st_callback *st_last[N_ST];
 
 /* Register a function interested in a state change. */
 void
-register_schange(LIB3270_STATE_CHANGE tx, void (*func)(int))
+register_schange(LIB3270_STATE_CHANGE tx, void (*func)(H3270 *, int))
 {
 	struct st_callback *st;
 
 	st = (struct st_callback *)Malloc(sizeof(*st));
-	st->func = func;
-	st->next = (struct st_callback *)NULL;
+
+	st->func	= func;
+	st->next	= (struct st_callback *)NULL;
+
 	if (st_last[tx] != (struct st_callback *)NULL)
 		st_last[tx]->next = st;
 	else
@@ -1001,10 +1005,9 @@ st_changed(int tx, int mode)
 {
 	struct st_callback *st;
 
-	for (st = st_callbacks[tx];
-	     st != (struct st_callback *)NULL;
-	     st = st->next) {
-		(*st->func)(mode);
+	for (st = st_callbacks[tx];st != (struct st_callback *)NULL;st = st->next)
+	{
+		(*st->func)(&h3270,mode);
 	}
 }
 
diff --git a/latest/src/lib/kybd.c b/latest/src/lib/kybd.c
index aa11c5c..48dbb27 100644
--- a/latest/src/lib/kybd.c
+++ b/latest/src/lib/kybd.c
@@ -405,7 +405,7 @@ kybd_inhibit(Boolean inhibit)
  * Called when a host connects or disconnects.
  */
 static void
-kybd_connect(int connected)
+kybd_connect(H3270 *session, int connected)
 {
 	if (kybdlock & KL_DEFERRED_UNLOCK)
 		RemoveTimeOut(unlock_id);
@@ -424,7 +424,7 @@ kybd_connect(int connected)
  * Called when we switch between 3270 and ANSI modes.
  */
 static void
-kybd_in3270(int in3270 unused)
+kybd_in3270(H3270 *session, int in3270 unused)
 {
 	if (kybdlock & KL_DEFERRED_UNLOCK)
 		RemoveTimeOut(unlock_id);
diff --git a/latest/src/lib/printer.c b/latest/src/lib/printer.c
index 99ea040..e4c98d0 100644
--- a/latest/src/lib/printer.c
+++ b/latest/src/lib/printer.c
@@ -101,8 +101,8 @@ static void	printer_otimeout(H3270 *session);
 static void	printer_etimeout(H3270 *session);
 static void	printer_dump(struct pr3o *p, Boolean is_err, Boolean is_dead);
 #endif /*]*/
-static void	printer_host_connect(int connected unused);
-static void	printer_exiting(int b unused);
+static void	printer_host_connect(H3270 *session, int connected unused);
+static void	printer_exiting(H3270 *session, int b unused);
 
 /* Globals */
 
@@ -657,7 +657,7 @@ printer_stop(void)
 
 /* The emulator is exiting.  Make sure the printer session is cleaned up. */
 static void
-printer_exiting(int b unused)
+printer_exiting(H3270 *session, int b unused)
 {
 	printer_stop();
 }
@@ -684,7 +684,7 @@ lu_callback(Widget w, XtPointer client_data, XtPointer call_data unused)
 
 /* Host connect/disconnect/3270-mode event. */
 static void
-printer_host_connect(int connected unused)
+printer_host_connect(H3270 *session, int connected unused)
 {
 	if (IN_3270) {
 		char *printer_lu = appres.printer_lu;
diff --git a/latest/src/lib/proxy.c b/latest/src/lib/proxy.c
index 4219255..d1b6ac2 100644
--- a/latest/src/lib/proxy.c
+++ b/latest/src/lib/proxy.c
@@ -688,10 +688,10 @@ proxy_socks5(int fd, char *host, unsigned short port, int force_d)
 		int rv;
 
 		/* Resolve the hostname. */
-		status_resolving(1);
+		status_resolving(&h3270,1);
 		rv = resolve_host_and_port(host, CN, &rport, &ha.sa, &ha_len,
 			errmsg, sizeof(errmsg));
-		status_resolving(0);
+		status_resolving(&h3270,0);
 		if (rv == -2)
 		    	use_name = 1;
 		else if (rv < 0) {
diff --git a/latest/src/lib/screen.c b/latest/src/lib/screen.c
index faf46d4..b4073e2 100644
--- a/latest/src/lib/screen.c
+++ b/latest/src/lib/screen.c
@@ -89,12 +89,12 @@ enum ts { TS_AUTO, TS_ON, TS_OFF };
 
 // int windows_cp = 0;
 
-static void status_connect(int ignored);
-static void status_3270_mode(int ignored);
-static void status_printer(int on);
+static void status_connect(H3270 *session, int ignored);
+static void status_3270_mode(H3270 *session, int ignored);
+static void status_printer(H3270 *session, int on);
 static int color_from_fa(unsigned char fa);
 // static Boolean ts_value(const char *s, enum ts *tsp);
-static void relabel(int ignored);
+static void relabel(H3270 *session, int ignored);
 
 void set_display_charset(char *dcs)
 {
@@ -114,7 +114,7 @@ static void addch(int row, int col, int c, int attr)
  * @return 0 if ok, non zero if not
  *
  */
-int screen_init(void)
+int screen_init(H3270 *session)
 {
 
 	/* Initialize the console. */
@@ -148,7 +148,7 @@ int screen_init(void)
 
 	/* Set up the controller. */
 	ctlr_init(-1);
-	ctlr_reinit(-1);
+	ctlr_reinit(session,-1);
 
 	/* Set the window label. */
 #if defined(WC3270) /*[*/
@@ -603,7 +603,7 @@ status_oerr(int error_type)
 
 }
 
-void status_resolving(Boolean on)
+void status_resolving(H3270 *session, Boolean on)
 {
 	if(callbacks && callbacks->cursor)
 			callbacks->cursor(on ? CURSOR_MODE_LOCKED : CURSOR_MODE_NORMAL);
@@ -611,7 +611,7 @@ void status_resolving(Boolean on)
 	status_changed(on ? STATUS_CODE_RESOLVING : STATUS_CODE_BLANK);
 }
 
-void status_connecting(Boolean on)
+void status_connecting(H3270 *session, Boolean on)
 {
 	if(callbacks && callbacks->cursor)
 			callbacks->cursor(on ? CURSOR_MODE_LOCKED : CURSOR_MODE_NORMAL);
@@ -699,7 +699,7 @@ void status_lu(const char *lu)
 		callbacks->lu(lu);
 }
 
-static void status_connect(int connected)
+static void status_connect(H3270 *session, int connected)
 {
 	STATUS_CODE id = STATUS_CODE_USER;
 
@@ -727,7 +727,7 @@ static void status_connect(int connected)
 
 }
 
-static void status_3270_mode(int ignored unused)
+static void status_3270_mode(H3270 *session, int ignored unused)
 {
 	Boolean oia_boxsolid = (IN_3270 && !IN_SSCP);
 	if(oia_boxsolid)
@@ -736,7 +736,7 @@ static void status_3270_mode(int ignored unused)
 
 }
 
-static void status_printer(int on)
+static void status_printer(H3270 *session, int on)
 {
 	set(OIA_FLAG_PRINTER,on);
 }
@@ -802,7 +802,7 @@ screen_title(char *text)
 }
 
 static void
-relabel(int ignored unused)
+relabel(H3270 *session, int ignored unused)
 {
 #if defined(WC3270) /*[*/
 	if (appres.title != CN)
diff --git a/latest/src/lib/screen.h b/latest/src/lib/screen.h
index b43387e..ebe09a7 100644
--- a/latest/src/lib/screen.h
+++ b/latest/src/lib/screen.h
@@ -20,6 +20,6 @@ LIB3270_INTERNAL Boolean screen_has_changes;
 
 LIB3270_INTERNAL void screen_update(H3270 *session, int bstart, int bend);
 
-LIB3270_INTERNAL void status_connecting(Boolean on);
-LIB3270_INTERNAL void status_resolving(Boolean on);
+LIB3270_INTERNAL void status_connecting(H3270 *session, Boolean on);
+LIB3270_INTERNAL void status_resolving(H3270 *session, Boolean on);
 
diff --git a/latest/src/lib/screenc.h b/latest/src/lib/screenc.h
index 9a06bf0..e12e8e3 100644
--- a/latest/src/lib/screenc.h
+++ b/latest/src/lib/screenc.h
@@ -26,7 +26,7 @@ LIB3270_INTERNAL void screen_132(void);
 LIB3270_INTERNAL void screen_80(void);
 LIB3270_INTERNAL void screen_erase(H3270 *session);
 LIB3270_INTERNAL void screen_changed(H3270 *session, int bstart, int bend);
-LIB3270_INTERNAL int screen_init(void);
+LIB3270_INTERNAL int screen_init(H3270 *session);
 LIB3270_INTERNAL void screen_flip(void);
 LIB3270_INTERNAL FILE *start_pager(void);
 LIB3270_INTERNAL Boolean screen_new_display_charsets(char *cslist, char *csname);
diff --git a/latest/src/lib/telnet.c b/latest/src/lib/telnet.c
index a9f7d59..a83612c 100644
--- a/latest/src/lib/telnet.c
+++ b/latest/src/lib/telnet.c
@@ -516,14 +516,14 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
 		haddr.sin.sin_port = passthru_port;
 		ha_len = sizeof(struct sockaddr_in);
 	} else if (proxy_type > 0) {
-			status_resolving(1);
+			status_resolving(&h3270,1);
 	    	if (resolve_host_and_port(proxy_host, proxy_portname,
 			    &proxy_port, &haddr.sa, &ha_len, errmsg,
 			    sizeof(errmsg)) < 0) {
 		    	popup_an_error(errmsg);
-				status_resolving(0);
+				status_resolving(&h3270,0);
 		    	return -1;
-			status_resolving(0);
+			status_resolving(&h3270,0);
 		}
 	} else {
 #if defined(LOCAL_PROCESS) /*[*/
@@ -534,14 +534,14 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
 #if defined(LOCAL_PROCESS) /*[*/
 			local_process = False;
 #endif /*]*/
-			status_resolving(1);
+			status_resolving(&h3270,1);
 			if (resolve_host_and_port(host, portname,
 				    &h3270.current_port, &haddr.sa, &ha_len,
 				    errmsg, sizeof(errmsg)) < 0) {
 			    	popup_an_error(errmsg);
-					status_resolving(0);
+					status_resolving(&h3270,0);
 			    	return -1;
-			status_resolving(0);
+			status_resolving(&h3270,0);
 			}
 #if defined(LOCAL_PROCESS) /*[*/
 		}
@@ -637,7 +637,7 @@ int net_connect(const char *host, char *portname, Boolean ls, Boolean *resolving
 #endif /*]*/
 
 		/* connect */
-		status_connecting(1);
+		status_connecting(&h3270,1);
 		if (connect(h3270.sock, &haddr.sa, ha_len) == -1) {
 			if (socket_errno() == SE_EWOULDBLOCK
 #if defined(SE_EINPROGRESS) /*[*/
diff --git a/latest/src/lib/trace_ds.c b/latest/src/lib/trace_ds.c
index 1cde413..e5d94dc 100644
--- a/latest/src/lib/trace_ds.c
+++ b/latest/src/lib/trace_ds.c
@@ -419,7 +419,7 @@ create_tracefile_header(const char *mode)
 	wtrace("Trace %s %s", mode, ctime(&clk));
 	wtrace(" Version: %s\n", build);
 	save_yourself();
-	wtrace(" Command: %s\n", command_string);
+//	wtrace(" Command: %s\n", command_string);
 	wtrace(" Model %s", h3270.model_name);
 	wtrace(", %s display", appres.mono ? "monochrome" : "color");
 	if (appres.extended)
diff --git a/latest/src/plugins/rexx/init.c b/latest/src/plugins/rexx/init.c
index f356a2c..f83a66b 100644
--- a/latest/src/plugins/rexx/init.c
+++ b/latest/src/plugins/rexx/init.c
@@ -57,7 +57,7 @@
 	if(hSession)
 		return RetValue(Retstr,EBUSY);
 
-	hSession = new_3270_session();
+	hSession = new_3270_session("");
 
 	if(!hSession)
 		return RetValue(Retstr,-1);
diff --git a/latest/src/plugins/rexx/std_start.c b/latest/src/plugins/rexx/std_start.c
index a6edf37..82cec30 100644
--- a/latest/src/plugins/rexx/std_start.c
+++ b/latest/src/plugins/rexx/std_start.c
@@ -136,7 +136,7 @@ RexxReturnCode REXXENTRY rx3270LoadFuncs(PSZ Name, LONG Argc, RXSTRING Argv[], P
 		RexxRegisterFunctionExe((char *) rexx_exported_calls[f].name,rexx_exported_calls[f].call);
 
 	// Init 3270 library
-	hSession = new_3270_session();
+	hSession = new_3270_session("");
 
 	return RetValue(Retstr,0);
 }
--
libgit2 0.21.2