diff --git a/repertory/librepertory/include/file_manager/upload.hpp b/repertory/librepertory/include/file_manager/upload.hpp
index 1c3247fe..f7a22c8f 100644
--- a/repertory/librepertory/include/file_manager/upload.hpp
+++ b/repertory/librepertory/include/file_manager/upload.hpp
@@ -47,8 +47,8 @@ private:
 private:
   bool cancelled_{false};
   api_error error_{api_error::success};
-  std::unique_ptr<std::thread> thread_;
   stop_type stop_requested_{false};
+  std::unique_ptr<std::thread> thread_;
 
 private:
   void upload_thread();
diff --git a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
index be216674..86f0843f 100644
--- a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
+++ b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
@@ -41,7 +41,7 @@ namespace repertory::remote_fuse {
 #define RAISE_REMOTE_FUSE_SERVER_EVENT(func, file, ret)                        \
   if (config_.get_enable_drive_events() &&                                     \
       (((config_.get_event_level() >= remote_fuse_server_event::level) &&      \
-        (ret < 0)) ||                                                          \
+        ((ret) < 0)) ||                                                        \
        (config_.get_event_level() >= event_level::trace)))                     \
   event_system::instance().raise<remote_fuse_server_event>(std::string{func},  \
                                                            file, ret)
diff --git a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_client.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_client.cpp
index ecb09587..d3cf35be 100644
--- a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_client.cpp
+++ b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_client.cpp
@@ -33,7 +33,7 @@ namespace repertory::remote_winfsp {
 #define RAISE_REMOTE_WINFSP_CLIENT_EVENT(func, file, ret)                      \
   if (config_.get_enable_drive_events() &&                                     \
       (((config_.get_event_level() >= remote_winfsp_client_event::level) &&    \
-        (ret != STATUS_SUCCESS)) ||                                            \
+        ((ret) != STATUS_SUCCESS)) ||                                          \
        (config_.get_event_level() >= event_level::trace)))                     \
   event_system::instance().raise<remote_winfsp_client_event>(                  \
       std::string{func}, file, ret)
diff --git a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
index 2f2b8922..d6391a53 100644
--- a/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
+++ b/repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
@@ -47,7 +47,7 @@ namespace repertory::remote_winfsp {
 #define RAISE_REMOTE_WINFSP_SERVER_EVENT(func, file, ret)                      \
   if (config_.get_enable_drive_events() &&                                     \
       (((config_.get_event_level() >= remote_winfsp_server_event::level) &&    \
-        (ret != STATUS_SUCCESS)) ||                                            \
+        ((ret) != STATUS_SUCCESS)) ||                                          \
        (config_.get_event_level() >= event_level::trace)))                     \
   event_system::instance().raise<remote_winfsp_server_event>(                  \
       std::string{func}, file, ret)