diff --git a/NativeAppTemplate/Logging/Logger.swift b/NativeAppTemplate/Logging/Logger.swift
index a7c4124..4f2c636 100644
--- a/NativeAppTemplate/Logging/Logger.swift
+++ b/NativeAppTemplate/Logging/Logger.swift
@@ -91,7 +91,7 @@ struct Event {
     ) -> Self {
         .init(
             source: "\(Source.self)",
-            action: "Refresh"
+            action: action
         )
     }
 
diff --git a/NativeAppTemplate/NFCManager.swift b/NativeAppTemplate/NFCManager.swift
index 84ccd0b..a922e5d 100644
--- a/NativeAppTemplate/NFCManager.swift
+++ b/NativeAppTemplate/NFCManager.swift
@@ -15,7 +15,7 @@ protocol NFCManagerProtocol: Sendable {
     func startReading() async
     func startReadingForTesting() async
 
-    func startWriting(ndefMessage: sending NFCNDEFMessage, isLock: Bool) async
+    func startWriting(ndefMessage: NFCNDEFMessage, isLock: Bool) async
 }
 
 final class NFCManager: NSObject, ObservableObject, @unchecked Sendable {
diff --git a/NativeAppTemplate/UI/App Root/AppTabView.swift b/NativeAppTemplate/UI/App Root/AppTabView.swift
index 8f9f311..842a994 100644
--- a/NativeAppTemplate/UI/App Root/AppTabView.swift	
+++ b/NativeAppTemplate/UI/App Root/AppTabView.swift	
@@ -14,7 +14,6 @@ struct AppTabView<
     @Environment(DataManager.self) private var dataManager
     @Environment(TabViewModel.self) private var model
     @State var navigationPathShops = NavigationPath()
-    @State var navigationPathStats = NavigationPath()
     private let shopListView: () -> ShopListView
     private let scanView: () -> ScanView
     private let settingsView: () -> SettingsView
@@ -83,13 +82,11 @@ extension AppTabView: View {
         .tint(.accent)
         .onChange(of: sessionController.client) {
             navigationPathShops = NavigationPath()
-            navigationPathStats = NavigationPath()
         }
         .onChange(of: sessionController.shouldPopToRootView) {
             if sessionController.shouldPopToRootView {
                 navigationPathShops = NavigationPath()
-                navigationPathStats = NavigationPath()
-                sessionController.shouldPopToRootView = false
+                    sessionController.shouldPopToRootView = false
             }
         }
     }
diff --git a/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModel.swift
index a2a7cff..d58679f 100644
--- a/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModel.swift	
+++ b/NativeAppTemplate/UI/Shop Settings/ItemTag Detail/ItemTagDetailViewModel.swift	
@@ -83,7 +83,7 @@ final class ItemTagDetailViewModel {
             return
         }
 
-        let ndefMessage = createNdefMessage(itemTag: itemTag, itemTagType: .server)
+        nonisolated(unsafe) let ndefMessage = createNdefMessage(itemTag: itemTag, itemTagType: .server)
 
         Task {
             await nfcManager.startWriting(ndefMessage: ndefMessage, isLock: isLocked)
@@ -104,7 +104,7 @@ final class ItemTagDetailViewModel {
             return
         }
 
-        let ndefMessage = createNdefMessage(itemTag: itemTag, itemTagType: .customer)
+        nonisolated(unsafe) let ndefMessage = createNdefMessage(itemTag: itemTag, itemTagType: .customer)
 
         Task {
             await nfcManager.startWriting(ndefMessage: ndefMessage, isLock: isLocked)