diff --git a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
index 414d3dfa..13cdc73d 100644
--- a/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
+++ b/MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
@@ -46,7 +46,7 @@ import VDS
             self.accessibilityIdentifier = accessibilityIdentifier
         }
         
-        if var closeButton = viewModel.closeButton {
+        if let closeButton = viewModel.closeButton {
             onCloseClick = { [weak self] _ in
                 guard let self else { return }
                 if closeButton.action.actionType == ActionNoopModel.identifier {
diff --git a/MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift b/MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift
index 7035ab75..4e1c9ba4 100644
--- a/MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift
+++ b/MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift
@@ -20,8 +20,10 @@
     }
     
     public override func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> MoleculeModelProtocol? {
+        if let replacedMolecule = try super.replaceChildMolecule(with: molecule) {
+            return replacedMolecule
+        }
         var replacedMolecule: MoleculeModelProtocol?
-        return try super.replaceChildMolecule(with: molecule)
         if try replaceChildMolecule(at: &navigationBar, with: molecule, replaced: &replacedMolecule)
             || replaceChildMolecule(at: &moleculeStack, with: molecule, replaced: &replacedMolecule) {
             return replacedMolecule
diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index d1df5e13..dc2ed356 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -315,7 +315,7 @@ import MVMCore
             if let updatedMolecules = behavior.onPageNew(rootMolecules: newTemplateModel.rootMolecules, delegateObjectIVar, changes: &changes) {
                 updatedMolecules.forEach { molecule in
                     // Replace again in case there is a template level child.
-                    if let replaced = try? newTemplateModel.replaceChildMolecule(with: molecule) {
+                    if let _ = try? newTemplateModel.replaceChildMolecule(with: molecule) {
                         // Only recognize the molecules that actually changed.
                         if changes.count > 0 {
                             debugLog("\(behavior) updated \(changes) in template model.")