diff --git a/laf b/laf
index 0c7225906..f2b07e414 160000
--- a/laf
+++ b/laf
@@ -1 +1 @@
-Subproject commit 0c7225906f2e2e7630ba7d73e8d55290b841ca1c
+Subproject commit f2b07e41469d541ac3e38af2ce551260cece3de6
diff --git a/src/app/crash/data_recovery.h b/src/app/crash/data_recovery.h
index acf67f4a7..fb577c6b6 100644
--- a/src/app/crash/data_recovery.h
+++ b/src/app/crash/data_recovery.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2019  Igara Studio S.A.
+// Copyright (C) 2019-2021  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -14,6 +14,7 @@
 #include "base/disable_copying.h"
 #include "obs/signal.h"
 
+#include <atomic>
 #include <mutex>
 #include <thread>
 #include <vector>
@@ -60,7 +61,7 @@ namespace crash {
     Sessions m_sessions;
     SessionPtr m_inProgress;
     BackupObserver* m_backup;
-    bool m_searching;
+    std::atomic<bool> m_searching;
 
     DISABLE_COPYING(DataRecovery);
   };
diff --git a/src/app/job.h b/src/app/job.h
index e8b9a6662..e01d184a7 100644
--- a/src/app/job.h
+++ b/src/app/job.h
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2021  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -11,6 +12,7 @@
 #include "ui/alert.h"
 #include "ui/timer.h"
 
+#include <atomic>
 #include <exception>
 
 namespace base {
@@ -64,7 +66,7 @@ namespace app {
     std::unique_ptr<ui::Timer> m_timer;
     base::mutex* m_mutex;
     ui::AlertPtr m_alert_window;
-    double m_last_progress;
+    std::atomic<double> m_last_progress;
     bool m_done_flag;
     bool m_canceled_flag;
     std::exception_ptr m_error;
diff --git a/src/clip b/src/clip
index 1e262be75..a65a9e543 160000
--- a/src/clip
+++ b/src/clip
@@ -1 +1 @@
-Subproject commit 1e262be75e448e575581e267904a8ec78bbc6991
+Subproject commit a65a9e543e9a270bb7c58789d15d027bbd8efb2a