diff -Naur FreeFileSync_9.0_Source-orig/FreeFileSync/Source/fs/abstract.h FreeFileSync_9.0_Source/FreeFileSync/Source/fs/abstract.h
--- FreeFileSync_9.0_Source-orig/FreeFileSync/Source/fs/abstract.h	2017-04-16 18:56:17.000000000 +0200
+++ FreeFileSync_9.0_Source/FreeFileSync/Source/fs/abstract.h	2017-04-19 16:25:52.184158538 +0200
@@ -12,6 +12,7 @@
 #include <zen/zstring.h>
 #include <zen/optional.h>
 #include <zen/serialize.h> //InputStream/OutputStream support buffered stream concept
+#include <zen/warn_static.h>
 #include "../lib/icon_holder.h"
 
 
diff -Naur FreeFileSync_9.0_Source-orig/FreeFileSync/Source/Makefile FreeFileSync_9.0_Source/FreeFileSync/Source/Makefile
--- FreeFileSync_9.0_Source-orig/FreeFileSync/Source/Makefile	2017-04-16 18:56:15.000000000 +0200
+++ FreeFileSync_9.0_Source/FreeFileSync/Source/Makefile	2017-04-19 17:12:02.789678576 +0200
@@ -121,5 +121,5 @@
 	$(APPSHAREDIR)
 
 	mkdir -p $(DOCSHAREDIR)
-	cp ../Build/Changelog.txt $(DOCSHAREDIR)/changelog
+	cp ../../Changelog.txt $(DOCSHAREDIR)/changelog
 	gzip $(DOCSHAREDIR)/changelog
diff -Naur FreeFileSync_9.0_Source-orig/FreeFileSync/Source/ui/main_dlg.cpp FreeFileSync_9.0_Source/FreeFileSync/Source/ui/main_dlg.cpp
--- FreeFileSync_9.0_Source-orig/FreeFileSync/Source/ui/main_dlg.cpp	2017-04-16 18:56:17.000000000 +0200
+++ FreeFileSync_9.0_Source/FreeFileSync/Source/ui/main_dlg.cpp	2017-04-19 17:02:44.045305760 +0200
@@ -956,7 +956,7 @@
         history.resize(globalSettings.gui.cfgFileHistMax);
 
     globalSettings.gui.cfgFileHistory = history;
-    globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem();
+    // globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem();
     //--------------------------------------------------------------------------------
     globalSettings.gui.lastUsedConfigFiles.clear();
     for (const Zstring& cfgFilePath : activeConfigFiles)
@@ -4767,13 +4767,13 @@
 
     m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg.gui.lastUpdateCheck));
 
-    if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
+    /*if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
     {
         flashStatusInformation(_("Searching for program updates..."));
         //synchronous update check is sufficient here:
         periodicUpdateCheckEval(this, globalCfg.gui.lastUpdateCheck, globalCfg.gui.lastOnlineVersion,
                                 periodicUpdateCheckRunAsync(periodicUpdateCheckPrepare().get()).get());
-    }
+    }*/
 }
 
 
@@ -4782,7 +4782,7 @@
     //execute just once per startup!
     Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
 
-    if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
+    /*if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
     {
         flashStatusInformation(_("Searching for program updates..."));
 
@@ -4794,7 +4794,7 @@
             periodicUpdateCheckEval(this, globalCfg.gui.lastUpdateCheck, globalCfg.gui.lastOnlineVersion,
                                     resultAsync.get()); //run on main thread:
         });
-    }
+    }*/
 }
 
 
diff -Naur FreeFileSync_9.0_Source-orig/zen/file_access.cpp FreeFileSync_9.0_Source/zen/file_access.cpp
--- FreeFileSync_9.0_Source-orig/zen/file_access.cpp	2017-04-16 18:56:16.000000000 +0200
+++ FreeFileSync_9.0_Source/zen/file_access.cpp	2017-04-19 16:45:51.042780882 +0200
@@ -385,7 +385,7 @@
 
 }
 
-warn_static("remove after test")
+//warn_static("remove after test")
 void zen::setFileTime(const Zstring& filePath, int64_t modTime, ProcSymlink procSl) //throw FileError
 {
     struct ::timespec writeTime = {};