diff --git a/Podfile.lock b/Podfile.lock
index b2d2b9efd..c41453c31 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -140,7 +140,7 @@ CHECKOUT OPTIONS:
     :commit: a3c843cc8a423c5924c663490978f81dba34d04e
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   SignalServiceKit:
-    :commit: '0393e4f0b4eea97ffcc8343558947363d303a904'
+    :commit: 0393e4f0b4eea97ffcc8343558947363d303a904
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
diff --git a/Signal/src/Storyboard/Main.storyboard b/Signal/src/Storyboard/Main.storyboard
index d49ab2c5a..968b678da 100644
--- a/Signal/src/Storyboard/Main.storyboard
+++ b/Signal/src/Storyboard/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tuk-0x-yCb">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tuk-0x-yCb">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -1018,7 +1018,7 @@
         <!--Navigation Controller-->
         <scene sceneID="nF7-wR-ITu">
             <objects>
-                <navigationController id="u7y-N1-6Ba" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="SettingsNavigationController" id="u7y-N1-6Ba" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="OEe-gh-9Ii">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
diff --git a/Signal/src/view controllers/CallViewController.swift b/Signal/src/view controllers/CallViewController.swift
index 3e92c2d3f..2aea206f8 100644
--- a/Signal/src/view controllers/CallViewController.swift	
+++ b/Signal/src/view controllers/CallViewController.swift	
@@ -477,7 +477,7 @@ class CallViewController: UIViewController, CallObserver, CallServiceObserver, R
             // Settings nag views
             settingsNagView.autoPinEdge(toSuperviewEdge:.bottom, withInset:settingsNagBottomMargin)
             settingsNagView.autoPinWidthToSuperview(withMargin:settingsNagHMargin)
-            settingsNagView.autoPinEdge(.top, to:.bottom, of:callStatusLabel, withOffset:+avatarTopSpacing)
+            settingsNagView.autoPinEdge(.top, to:.bottom, of:callStatusLabel)
         }
 
         updateRemoteVideoLayout()
@@ -939,8 +939,9 @@ class CallViewController: UIViewController, CallObserver, CallServiceObserver, R
             }
         } else if shouldDelay {
             hasDismissed = true
-            DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
-                self.dismiss(animated: true, completion:completion)
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) { [weak self] in
+                guard let strongSelf = self else { return }
+                strongSelf.dismiss(animated: true, completion:completion)
             }
         } else {
             hasDismissed = true