diff --git a/.gitignore b/.gitignore
index 40a66b9..da755d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ resources.rc
 makeruntime.sh
 scripts
 locale
+certs
 *.xz
 src/include/lib3270
 *.desktop
diff --git a/src/pw3270/main.c b/src/pw3270/main.c
index 26143c2..7c87056 100644
--- a/src/pw3270/main.c
+++ b/src/pw3270/main.c
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
 		trace("appdir=\"%s\"",appdir);
 		trace("locdir=\"%s\"",locdir);
 
-		g_chdir(appdir);
+//		g_chdir(appdir);
 
 		bindtextdomain( PACKAGE_NAME, locdir );
 		bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
@@ -426,7 +426,7 @@ int main(int argc, char *argv[])
 
 		g_message("Windows Application directory is \"%s\"",appdir);
 
-		g_chdir(appdir);
+//		g_chdir(appdir);
 
 		g_message("Application name is \"%s\"", g_get_application_name());
 		g_message("Session name is \"%s\"", session_name ? session_name : "undefined");
@@ -476,6 +476,7 @@ int main(int argc, char *argv[])
 		session_name = PACKAGE_NAME;
 
 	rc = initialize();
+
 	if(!rc)
 	{
 		GtkSettings *settings = gtk_settings_get_default();
@@ -487,6 +488,7 @@ int main(int argc, char *argv[])
 		}
 
 		toplevel = pw3270_new(host,systype,syscolors);
+
 		pw3270_set_session_name(toplevel,session_name);
 
 		if(oversize)
diff --git a/src/pw3270/plugin.c b/src/pw3270/plugin.c
index a28d833..76b378a 100644
--- a/src/pw3270/plugin.c
+++ b/src/pw3270/plugin.c
@@ -43,7 +43,7 @@
  {
 #ifdef _WIN32
 	UINT 		  errorMode;
- 	lib3270_autoptr(char)	path = lib3270_build_data_filename("plugins")
+ 	lib3270_autoptr(char)	path = lib3270_build_data_filename("plugins",NULL);
 #else
  	const gchar * path = LIBDIR G_DIR_SEPARATOR_S G_STRINGIFY(PRODUCT_NAME) "-plugins";
 #endif // _WIN32
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index a452b03..c0a1f3a 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -775,6 +775,9 @@ static GtkWidget * trace_window = NULL;
 		lib3270_autoptr(char) path = lib3270_build_data_filename("ui",NULL);
 #endif // DEBUG
 
+		trace("Loading UI from \"%s\"",path);
+		trace("Current dir is \"%s\"",g_get_current_dir());
+
 		if(ui_parse_xml_folder(GTK_WINDOW(widget),path,groupname,popupname,widget->terminal,widget_setup))
 		{
 			gtk_widget_set_sensitive(widget->terminal,FALSE);
--
libgit2 0.21.2