diff --git a/Podfile.lock b/Podfile.lock
index c0a4a5a04..e66a8ce89 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -44,7 +44,7 @@ PODS:
   - Reachability (3.2)
   - SAMKeychain (1.5.2)
   - SCWaveformView (1.0.0)
-  - SignalServiceKit (0.5.2):
+  - SignalServiceKit (0.5.3):
     - '25519'
     - AFNetworking
     - AxolotlKit
@@ -140,7 +140,7 @@ CHECKOUT OPTIONS:
     :commit: 03cde781234ade464dd26914d87e6e95afde1119
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: b0343ee1d1c7fa3a74bd9c9241884ec0bb371ffb
+    :commit: 725153307e605681c45b3f789ed2153f218805a6
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 41b57bb2fc292a814f758441a05243eb38457027
@@ -164,7 +164,7 @@ SPEC CHECKSUMS:
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SAMKeychain: 1865333198217411f35327e8da61b43de79b635b
   SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
-  SignalServiceKit: dfbd01cfaa2c26e7ebe644e7c5d91f8f1e7cfdec
+  SignalServiceKit: f596e83ab9d7ff9ef89364dfe4a912afda62d55a
   SocketRocket: dbb1554b8fc288ef8ef370d6285aeca7361be31e
   SQLCipher: 4c768761421736a247ed6cf412d9045615d53dff
   TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
diff --git a/Signal/src/Jobs/SessionResetJob.swift b/Signal/src/Jobs/SessionResetJob.swift
index 09c701fab..facedebec 100644
--- a/Signal/src/Jobs/SessionResetJob.swift
+++ b/Signal/src/Jobs/SessionResetJob.swift
@@ -34,7 +34,7 @@ class SessionResetJob: NSObject {
             let message = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(),
                                         in: self.thread,
                                         messageType: TSInfoMessageType.typeSessionDidEnd)
-            message?.save()
+            message.save()
         }, failure: {error in
             Logger.error("\(self.TAG) failed to send EndSesionMessage with error: \(error.localizedDescription)")
         });
diff --git a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
index f92f0e0b3..25fe2a909 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSMessageAdapter.m
@@ -37,7 +37,7 @@
 
 // for ErrorMessages
 
-@property NSInteger errorMessageType;
+@property TSErrorMessageType errorMessageType;
 
 // for outgoing Messages only
 
@@ -196,7 +196,7 @@
         }
     } else {
         TSErrorMessage *errorMessage = (TSErrorMessage *)interaction;
-        adapter.infoMessageType      = errorMessage.errorType;
+        adapter.errorMessageType = errorMessage.errorType;
         adapter.messageBody          = errorMessage.description;
         adapter.messageType          = TSErrorMessageAdapter;
     }
diff --git a/Signal/src/audio/AppAudioManager.h b/Signal/src/audio/AppAudioManager.h
index 035f6dee1..e3512da73 100644
--- a/Signal/src/audio/AppAudioManager.h
+++ b/Signal/src/audio/AppAudioManager.h
@@ -1,6 +1,3 @@
-#import <Foundation/Foundation.h>
-
-#import <AVFoundation/AVAudioSession.h>
 #import "CallProgress.h"
 #import "CallTermination.h"
 #import "SoundPlayer.h"
@@ -15,6 +12,8 @@
  *  which speaker to use or if all sounds should be muted.
  **/
 
+@import AVFoundation;
+
 @interface AppAudioManager : NSObject <SoundPlayerDelegate>
 
 enum AudioProfile {
diff --git a/Signal/src/audio/AudioRouter.m b/Signal/src/audio/AudioRouter.m
index 04e2bd72e..dbc50e8db 100644
--- a/Signal/src/audio/AudioRouter.m
+++ b/Signal/src/audio/AudioRouter.m
@@ -1,6 +1,6 @@
 #import "AudioRouter.h"
 
-#import <AVFoundation/AVAudioSession.h>
+@import AVFoundation;
 
 #define DEFAULT_CATAGORY AVAudioSessionCategoryPlayAndRecord
 
diff --git a/Signal/src/audio/SoundInstance.h b/Signal/src/audio/SoundInstance.h
index 4a3e90df4..e7ca93d8d 100644
--- a/Signal/src/audio/SoundInstance.h
+++ b/Signal/src/audio/SoundInstance.h
@@ -1,4 +1,4 @@
-#import <AVFoundation/AVAudioPlayer.h>
+@import AVFoundation;
 
 /**
  *  Wrapper for system dependant audio interface.