diff --git a/pw3270.cbp b/pw3270.cbp
index ddcd7f8..6f24dc9 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -32,17 +32,6 @@
 					<Add option="-s" />
 				</Linker>
 			</Target>
-			<Target title="oxt">
-				<Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
-				<Option object_output=".obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option use_console_runner="0" />
-				<Compiler>
-					<Add option="-g" />
-					<Add option="-DDEBUG=1" />
-				</Compiler>
-			</Target>
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
@@ -84,18 +73,9 @@
 		<Unit filename="src/include/pw3270/trace.h" />
 		<Unit filename="src/include/pw3270cpp.h" />
 		<Unit filename="src/include/rules.mak.in" />
-		<Unit filename="src/java/Makefile.in">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/jni3270.h">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/private.h">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
+		<Unit filename="src/java/Makefile.in" />
+		<Unit filename="src/java/jni3270.h" />
+		<Unit filename="src/java/private.h" />
 		<Unit filename="src/lib3270/3270ds.h" />
 		<Unit filename="src/lib3270/Makefile.in" />
 		<Unit filename="src/lib3270/ansic.h" />
diff --git a/src/pw3270/main.c b/src/pw3270/main.c
index 95bbd2d..8217b3a 100644
--- a/src/pw3270/main.c
+++ b/src/pw3270/main.c
@@ -232,6 +232,7 @@ static gboolean startup(GtkWidget *toplevel)
 int main(int argc, char *argv[])
 {
 	const gchar		* pluginpath	= NULL;
+
 #ifdef DEFAULT_SESSION_NAME
 	const gchar		* session_name	= G_STRINGIFY(DEFAULT_SESSION_NAME);
 #else
@@ -252,8 +253,43 @@ int main(int argc, char *argv[])
 	setlocale( LC_ALL, "" );
 #endif
 
-	bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
-	textdomain(PACKAGE_NAME);
+	// Get DATADIR
+#if defined( _WIN32 )
+	{
+		g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
+		g_autofree gchar * locdir = g_build_filename(appdir,"locale",NULL);
+
+		trace("appdir=\"%s\"",appdir);
+		trace("locdir=\"%s\"",locdir);
+
+		g_chdir(appdir);
+
+		bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
+		textdomain(PACKAGE_NAME);
+
+		bindtextdomain( PACKAGE_NAME, locdir );
+
+	}
+#elif defined(HAVE_GTKMAC)
+	{
+		GtkMacBundle * macbundle = gtk_mac_bundle_get_default();
+
+		g_chdir(gtk_mac_bundle_get_datadir(macbundle));
+
+		bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
+		textdomain(PACKAGE_NAME);
+
+		bindtextdomain(PACKAGE_NAME,gtk_mac_bundle_get_localedir(macbundle));
+
+		osxapp = GTK_OSX_APPLICATION(g_object_new(GTK_TYPE_OSX_APPLICATION,NULL));
+
+	}
+#else
+	{
+		bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
+		textdomain(PACKAGE_NAME);
+	}
+#endif
 
 	// Process command-line options
 	{
@@ -325,44 +361,6 @@ int main(int argc, char *argv[])
 	// Init GTK
 	gtk_init(&argc, &argv);
 
-	// Get DATADIR
-#if defined( WIN32 )
-	{
-		gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
-		gchar * locdir = g_build_filename(appdir,"locale",NULL);
-
-		g_chdir(appdir);
-		bindtextdomain( PACKAGE_NAME, locdir );
-
-		g_free(locdir);
-		g_free(appdir);
-
-	}
-#elif defined(HAVE_GTKMAC)
-	{
-		GtkMacBundle * macbundle = gtk_mac_bundle_get_default();
-
-		g_chdir(gtk_mac_bundle_get_datadir(macbundle));
-		bindtextdomain(PACKAGE_NAME,gtk_mac_bundle_get_localedir(macbundle));
-
-		osxapp = GTK_OSX_APPLICATION(g_object_new(GTK_TYPE_OSX_APPLICATION,NULL));
-
-	}
-#elif defined( DATAROOTDIR )
-	{
-		gchar * appdir = g_build_filename(DATAROOTDIR,PACKAGE_NAME,NULL);
-		gchar * locdir = g_build_filename(DATAROOTDIR,"locale",NULL);
-
-		g_chdir(appdir);
-		bindtextdomain( PACKAGE_NAME, locdir);
-
-		g_free(locdir);
-		g_free(appdir);
-
-	}
-#endif // DATAROOTDIR
-
-
 #if defined( HAVE_SYSLOG )
 	if(log_to_syslog)
 	{
--
libgit2 0.21.2