diff --git a/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift
index 943f53ad..22ec9bcd 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift
@@ -108,8 +108,7 @@ extension TabsListItemModel: AddMolecules {
     public func moleculesToAdd() -> AddMolecules.AddParameters? {
         guard addedMolecules == nil else { return nil }
         let index = tabs.selectedIndex
-        guard molecules.count >= index else { return nil }
-        let addedMolecules = molecules[index]
+        guard let addedMolecules = molecules[safe: index] else { return nil }
         self.addedMolecules = addedMolecules
         return (addedMolecules, .below)
     }
diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
index 3ef117da..fc79b5bd 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
@@ -361,7 +361,7 @@ open class Carousel: View {
     }
     
     func trackSwipeActionAnalyticsforIndex(_ index : Int){
-        guard let itemModel = molecules?[index],
+        guard let itemModel = molecules?[safe:index],
               let viewControllerObject = delegateObject?.moleculeDelegate as? MVMCoreViewControllerProtocol else { return }
         MVMCoreUILoggingHandler.shared()?.defaultLogAction(forController: viewControllerObject, actionInformation: itemModel.toJSON(), additionalData: nil)
     }
diff --git a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
index 4bd889bd..c85e7b85 100644
--- a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
+++ b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
@@ -52,8 +52,8 @@ open class ThreeLayerTableViewController: ProgrammaticTableViewController, Rotor
             bottomView.updateView(width)
             showFooter(width)
         }
-        tableView.visibleCells.forEach { cell in
-          (cell as? MVMCoreViewProtocol)?.updateView(width)
+        MVMCoreUIUtility.findParentViews(by: (UITableViewCell & MVMCoreViewProtocol).self, views: tableView.subviews).forEach { view in
+          view.updateView(width)
         }
     }
     
diff --git a/MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift b/MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift
index ea91f62b..5b70412e 100644
--- a/MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift
+++ b/MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift
@@ -60,6 +60,16 @@ public extension MVMCoreUIUtility {
         return findViews(by: type, views: queue, excludedViews: excludedViews) + matching
     }
     
+    static func findParentViews<T>(by type: T.Type, views: [UIView]) -> [T] {
+        return views.reduce(into: [T]()) { matchingViews, view in
+            if let view = view as? T {
+                return matchingViews.append(view) // If this view is the type stop here and return, ignoring its children.
+            }
+            // Otherwise check downstream.
+            matchingViews += findParentViews(by: type, views: view.subviews)
+        }
+    }
+    
     @MainActor
     static func visibleNavigationBarStlye() -> NavigationItemStyle? {
         if let navController = NavigationController.navigationController(),