diff --git a/bin/tryton b/bin/tryton
index 6f5868d11f..18dc15f57e 100755
--- a/bin/tryton
+++ b/bin/tryton
@@ -23,7 +23,9 @@ if hasattr(sys, 'frozen'):
             etc, 'gtk-2.0', 'gdk-pixbuf.loaders')
     os.environ['GTK_IM_MODULE_FILE'] = os.path.join(
             etc, 'gtk-2.0', 'gtk.immodules')
-    if sys.platform == 'win32':
+    if os.platform == 'win32':
+        # cx_freeze >= 5 put python modules under lib directory
+        sys.path.append(os.path.join(prefix, 'lib'))
         os.environ.setdefault('SSL_CERT_FILE',
             os.path.join(etc, 'ssl', 'cert.pem'))
         os.environ.setdefault('SSL_CERT_DIR',
diff --git a/darwin/gtk-2.0/gtk.immodules b/darwin/gtk-2.0/gtk.immodules
index e01044642b..a37ca90d95 100644
--- a/darwin/gtk-2.0/gtk.immodules
+++ b/darwin/gtk-2.0/gtk.immodules
@@ -2,7 +2,7 @@
 # Automatically generated file, do not edit
 # Created by gtk-query-immodules-2.0 from gtk+-2.24.30
 #
-# ModulesPath = /Users/ced/.gtk-2.0/2.10.0/x86_64-apple-darwin15.5.0/immodules:/Users/ced/.gtk-2.0/2.10.0/immodules:/Users/ced/.gtk-2.0/x86_64-apple-darwin15.5.0/immodules:/Users/ced/.gtk-2.0/immodules:@executable_path/lib/gtk-2.0/2.10.0/x86_64-apple-darwin15.5.0/immodules:/Users/ced/gtk/inst/lib/gtk-2.0/2.10.0/immodules:/Users/ced/gtk/inst/lib/gtk-2.0/x86_64-apple-darwin15.5.0/immodules:/Users/ced/gtk/inst/lib/gtk-2.0/immodules
+# ModulesPath = @executable_path/lib/gtk-2.0/immodules
 #
 "@executable_path/lib/gtk-2.0/2.10.0/immodules/im-am-et.so" 
 "am_et" "Amharic (EZ+)" "gtk20" "@executable_path/share/locale" "am" 
diff --git a/make-darwin-installer.sh b/make-darwin-installer.sh
index 995ac93d36..46d7653917 100644
--- a/make-darwin-installer.sh
+++ b/make-darwin-installer.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+set -e
 version=`python setup.py --version`
 python setup.py compile_catalog
 python setup-freeze.py bdist_mac
diff --git a/make-win32-installer.sh b/make-win32-installer.sh
index 3c16d6939c..ff4fe0b98d 100644
--- a/make-win32-installer.sh
+++ b/make-win32-installer.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+set -e
 version=`python setup.py --version`
 python setup.py compile_catalog
 python setup-freeze.py install_exe -d dist
diff --git a/setup-freeze.py b/setup-freeze.py
index efcbc73ee2..27ba40d037 100644
--- a/setup-freeze.py
+++ b/setup-freeze.py
@@ -1,5 +1,6 @@
 import os
 import sys
+import user
 from subprocess import Popen, PIPE
 
 from cx_Freeze import setup, Executable
@@ -52,12 +53,10 @@ setup(name='tryton',
     version=version,
     options={
         'build_exe': {
-            'compressed': False,
+            'no_compress': True,
             'include_files': include_files,
             'silent': True,
             'packages': ['gtk'],
-            'icon': os.path.join(
-                'tryton', 'data', 'pixmaps', 'tryton', 'tryton.ico'),
             'include_msvcr': True,
             },
         'bdist_mac': {
@@ -68,4 +67,7 @@ setup(name='tryton',
         },
     executables=[Executable(
             'bin/tryton',
-            base='Win32GUI' if sys.platform == 'win32' else None)])
+            base='Win32GUI' if sys.platform == 'win32' else None,
+            icon=os.path.join(
+                'tryton', 'data', 'pixmaps', 'tryton', 'tryton.ico'),
+            )])
diff --git a/win32/gtk-2.0/gdk-pixbuf.loaders b/win32/gtk-2.0/gdk-pixbuf.loaders
index 4d13e1c921..15d85d9f1d 100644
--- a/win32/gtk-2.0/gdk-pixbuf.loaders
+++ b/win32/gtk-2.0/gdk-pixbuf.loaders
@@ -2,7 +2,7 @@
 # Automatically generated file, do not edit
 # Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.35.4
 #
-# LoaderDir = C:\msys32\mingw32/lib/gdk-pixbuf-2.0/2.10.0/loaders
+# LoaderDir = lib/gdk-pixbuf-2.0/2.10.0/loaders
 #
 "lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll"
 "svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"