folder_watcher synchronisation improvements