diff --git a/schemas/windows/window.gschema.xml.in b/schemas/windows/window.gschema.xml.in
index 5084995..da5ba9d 100644
--- a/schemas/windows/window.gschema.xml.in
+++ b/schemas/windows/window.gschema.xml.in
@@ -75,13 +75,13 @@
     </key>
 
     <key name="toolbar-style" type="i">
-      <default>-1</default>
+      <default>0</default>
       <summary>How to draw the toolbar.</summary>
       <description></description>
     </key>
 
     <key name="toolbar-icon-size" type="i">
-      <default>0</default>
+      <default>2</default>
       <summary>The size of the icons in a toolbar</summary>
       <description></description>
     </key>
diff --git a/src/objects/application/actions/window.c b/src/objects/application/actions/window.c
index d9fc976..6a32e5c 100644
--- a/src/objects/application/actions/window.c
+++ b/src/objects/application/actions/window.c
@@ -89,10 +89,10 @@
  	return G_ACTION(action);
  }
 
- static void new_window_activated(GAction *action, GVariant *parameter, GtkApplication *application) {
+ static void new_window_activated(GAction G_GNUC_UNUSED(*action), GVariant G_GNUC_UNUSED(*parameter), GtkApplication *application) {
 
  	debug("%s",__FUNCTION__);
- 	g_application_activate(application);
+ 	g_application_activate(G_APPLICATION(application));
 
  }
 
diff --git a/src/objects/settings/dialog.c b/src/objects/settings/dialog.c
index 31ac88c..6ebc067 100644
--- a/src/objects/settings/dialog.c
+++ b/src/objects/settings/dialog.c
@@ -27,6 +27,11 @@
  *
  */
 
+#ifdef _WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // _WIN32
+
  #include <pw3270.h>
  #include <pw3270/settings.h>
  #include <pw3270/actions.h>
diff --git a/src/objects/settings/widget.c b/src/objects/settings/widget.c
index 3cebe6c..65eb177 100644
--- a/src/objects/settings/widget.c
+++ b/src/objects/settings/widget.c
@@ -27,6 +27,11 @@
  *
  */
 
+#ifdef _WIN32
+	#include <winsock2.h>
+	#include <windows.h>
+#endif // _WIN32
+
  #include <pw3270.h>
  #include <pw3270/settings.h>
  #include <lib3270.h>
diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in
index a309080..208bc23 100644
--- a/win/pw3270.nsi.in
+++ b/win/pw3270.nsi.in
@@ -309,6 +309,8 @@ Section "Uninstall"
 	DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PW3270_SDK_PATH"
 	SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
 
+	DeleteRegKey HKLM "Software\GSettings\apps\@PACKAGE_NAME@\@PRODUCT_NAME@"
+
 	# Delete System libraries
 	${@NSISREDIR@}
 
--
libgit2 0.21.2