diff --git a/src/lib3270/ssl.c b/src/lib3270/ssl.c
index bfdd5e1..9c1f616 100644
--- a/src/lib3270/ssl.c
+++ b/src/lib3270/ssl.c
@@ -177,6 +177,8 @@ int ssl_negotiate(H3270 *hSession)
 
 	/* Tell the world that we are (still) connected, now in secure mode. */
 	lib3270_set_connected(hSession);
+	non_blocking(hSession,True);
+
 	return 0;
 }
 #endif // HAVE_LIBSSL
diff --git a/src/pw3270/v3270/iocallback.c b/src/pw3270/v3270/iocallback.c
index 260e9b6..97e8d87 100644
--- a/src/pw3270/v3270/iocallback.c
+++ b/src/pw3270/v3270/iocallback.c
@@ -182,14 +182,14 @@ static gboolean IO_check(GSource *source)
 	 */
 #ifdef _WIN32
 
-	fd_set rfds, wfds, xfds;
+	fd_set rfds, wfds;
 	struct timeval tm;
 
 	memset(&tm,0,sizeof(tm));
 
 	FD_ZERO(&rfds);
 	FD_ZERO(&wfds);
-	FD_ZERO(&xfds);
+//	FD_ZERO(&xfds);
 
 	if(((IO_Source *) source)->poll.events & G_IO_IN)
 	{
@@ -201,7 +201,7 @@ static gboolean IO_check(GSource *source)
 		FD_SET(((IO_Source *) source)->poll.fd, &wfds);
 	}
 
-	if(select(((IO_Source *) source)->poll.fd+1, &rfds, &wfds, &xfds, &tm) > 0)
+	if(select(((IO_Source *) source)->poll.fd+1, &rfds, &wfds, NULL, &tm) > 0)
 		return TRUE;
 
 #else
diff --git a/ui/98trace.xml b/ui/98trace.xml
index 0fba4bc..0b9a1ba 100644
--- a/ui/98trace.xml
+++ b/ui/98trace.xml
@@ -37,8 +37,8 @@
 				<menuitem action='toggle' id='screentrace'	label='Trace screen contents' />
 				<menuitem action='toggle' id='nettrace' 	label='Trace network data flow' />
 				<menuitem action='toggle' id='eventtrace'	label='Trace user interface events' />
-				<menuitem action='toggle' id='fieldattr'	label='View Field Delimiters' />
 			</menu>
+			<menuitem action='toggle' id='fieldattr' label='Field Delimiters' />
 		</menu>
 
 	</menubar>
--
libgit2 0.21.2