diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
index 3e600734..7c2dfa9b 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
@@ -137,7 +137,7 @@
         }
     }
     
-    public override func encode(to encoder: Encoder) throws {
+    open override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeIfPresent(placeholder, forKey: .placeholder)
diff --git a/MVMCoreUI/Containers/NavigationController.swift b/MVMCoreUI/Containers/NavigationController.swift
index e74671ad..c2b63a6e 100644
--- a/MVMCoreUI/Containers/NavigationController.swift
+++ b/MVMCoreUI/Containers/NavigationController.swift
@@ -171,15 +171,19 @@ extension NavigationController: MVMCoreViewManagerProtocol {
 }
 
 extension NavigationController: MVMCorePresentationDelegateProtocol {
+    public func navigationController(_ navigationController: UINavigationController, prepareDisplayFor viewController: UIViewController) {
+        guard self == navigationController,
+              let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController),
+              let model = getNavigationModel(from: newViewController) else { return }
+        Self.setNavigationItem(navigationController: self, navigationItemModel: model, viewController: viewController)
+    }
+    
     public func navigationController(_ navigationController: UINavigationController, willDisplay viewController: UIViewController) {
-        guard self == navigationController else { return }
+        guard self == navigationController,
+              let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController) else { return }
         if let controller = viewController as? (UIViewController & MVMCoreViewManagerViewControllerProtocol) {
             MVMCoreViewManagerViewControllerProtocolHelper.helpSetManager(self, viewController: controller)
         }
-        guard let newViewController = MVMCoreUIUtility.getViewControllerTraversingManagers(viewController) else { return }
-        if let model = getNavigationModel(from: newViewController) {
-            Self.setNavigationItem(navigationController: self, navigationItemModel: model, viewController: viewController)
-        }
         manager?.willDisplay?(newViewController)
     }
     
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m b/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
index e2adbd74..3673d99e 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
@@ -35,7 +35,7 @@
         [self topNotificationAction:actionInformation additionalData:additionalData delegateObject:delegateObject];
         return YES;
     }
-    return NO;
+    return [super handleOtherActions:actionType actionInformation:actionInformation additionalData:additionalData delegateObject:delegateObject];
 }
 
 - (void)openPageAction:(NSDictionary *)actionInformation additionalData:(NSDictionary *)additionalData delegateObject:(DelegateObject *)delegateObject {