diff --git a/Session/Calls/UserInterface/Group/GroupCallViewController.swift b/Session/Calls/UserInterface/Group/GroupCallViewController.swift
index 816661b61..5837b7ac3 100644
--- a/Session/Calls/UserInterface/Group/GroupCallViewController.swift
+++ b/Session/Calls/UserInterface/Group/GroupCallViewController.swift
@@ -236,11 +236,12 @@ class GroupCallViewController: UIViewController {
 
             scrollView.isScrollEnabled = true
             videoGrid.isHidden = false
+            let height = size.height - view.safeAreaInsets.top - (controlsAreHidden ? 16 : callControls.height()) - (hasOverflowMembers ? videoOverflow.height() + 32 : 0)
             videoGrid.frame = CGRect(
                 x: 0,
                 y: view.safeAreaInsets.top,
                 width: size.width,
-                height: size.height - view.safeAreaInsets.top - (controlsAreHidden ? 16 : callControls.height) - (hasOverflowMembers ? videoOverflow.height + 32 : 0)
+                height: height
             )
             speakerPage.frame = CGRect(
                 x: 0,
@@ -258,7 +259,7 @@ class GroupCallViewController: UIViewController {
 
     func updateVideoOverflowTrailingConstraint() {
         var trailingConstraintConstant = -(GroupCallVideoOverflow.itemHeight * ReturnToCallViewController.pipSize.aspectRatio + 4)
-        if view.width() + trailingConstraintConstant > videoOverflow.contentSize.width() {
+        if view.width() + trailingConstraintConstant > videoOverflow.contentSize.width {
             trailingConstraintConstant += 16
         }
         videoOverflowTrailingConstraint.constant = trailingConstraintConstant
diff --git a/Session/Notifications/UserNotificationsAdaptee.swift b/Session/Notifications/UserNotificationsAdaptee.swift
index 45b9c2a5c..1049d8f7d 100644
--- a/Session/Notifications/UserNotificationsAdaptee.swift
+++ b/Session/Notifications/UserNotificationsAdaptee.swift
@@ -40,6 +40,7 @@ class UserNotificationConfig {
             return UNNotificationAction(identifier: action.identifier,
                                         title: CallStrings.showThreadButtonTitle,
                                         options: [.foreground])
+        default: preconditionFailure() // TODO: Implement
         }
     }
 
@@ -248,6 +249,7 @@ public class UserNotificationActionHandler: NSObject {
             return try actionHandler.reply(userInfo: userInfo, replyText: textInputResponse.userText)
         case .showThread:
             return try actionHandler.showThread(userInfo: userInfo)
+        default: preconditionFailure() // TODO: Implement
         }
     }
 }