diff --git a/SessionMessagingKit/Messages/Control Message/ExpirationTimerUpdate.swift b/SessionMessagingKit/Messages/Control Message/ExpirationTimerUpdate.swift
index caafe23c5..a8cd8d262 100644
--- a/SessionMessagingKit/Messages/Control Message/ExpirationTimerUpdate.swift	
+++ b/SessionMessagingKit/Messages/Control Message/ExpirationTimerUpdate.swift	
@@ -16,12 +16,12 @@ public final class ExpirationTimerUpdate : ControlMessage {
     // MARK: Coding
     public required init?(coder: NSCoder) {
         super.init(coder: coder)
-        if let duration = coder.decodeObject(forKey: "duration") as! UInt32? { self.duration = duration }
+        if let duration = coder.decodeObject(forKey: "durationSeconds") as! UInt32? { self.duration = duration }
     }
 
     public override func encode(with coder: NSCoder) {
         super.encode(with: coder)
-        coder.encode(duration, forKey: "duration")
+        coder.encode(duration, forKey: "durationSeconds")
     }
 
     // MARK: Proto Conversion
diff --git a/SessionMessagingKit/Messages/Control Message/ReadReceipt.swift b/SessionMessagingKit/Messages/Control Message/ReadReceipt.swift
index e91512a76..61b12200d 100644
--- a/SessionMessagingKit/Messages/Control Message/ReadReceipt.swift	
+++ b/SessionMessagingKit/Messages/Control Message/ReadReceipt.swift	
@@ -19,12 +19,12 @@ public final class ReadReceipt : ControlMessage {
     // MARK: Coding
     public required init?(coder: NSCoder) {
         super.init(coder: coder)
-        if let timestamps = coder.decodeObject(forKey: "timestamps") as! [UInt64]? { self.timestamps = timestamps }
+        if let timestamps = coder.decodeObject(forKey: "messageTimestamps") as! [UInt64]? { self.timestamps = timestamps }
     }
 
     public override func encode(with coder: NSCoder) {
         super.encode(with: coder)
-        coder.encode(timestamps, forKey: "timestamps")
+        coder.encode(timestamps, forKey: "messageTimestamps")
     }
 
     // MARK: Proto Conversion
diff --git a/SessionMessagingKit/Messages/Control Message/TypingIndicator.swift b/SessionMessagingKit/Messages/Control Message/TypingIndicator.swift
index 3bd072032..c37f57bb9 100644
--- a/SessionMessagingKit/Messages/Control Message/TypingIndicator.swift	
+++ b/SessionMessagingKit/Messages/Control Message/TypingIndicator.swift	
@@ -7,7 +7,7 @@ public final class TypingIndicator : ControlMessage {
     public override class var ttl: UInt64 { 30 * 1000 }
 
     // MARK: Kind
-    public enum Kind : String {
+    public enum Kind : Int {
         case started, stopped
 
         static func fromProto(_ proto: SNProtoTypingMessage.SNProtoTypingMessageAction) -> Kind {
@@ -37,12 +37,12 @@ public final class TypingIndicator : ControlMessage {
     // MARK: Coding
     public required init?(coder: NSCoder) {
         super.init(coder: coder)
-        if let rawKind = coder.decodeObject(forKey: "kind") as! String? { kind = Kind(rawValue: rawKind) }
+        if let rawKind = coder.decodeObject(forKey: "action") as! Int? { kind = Kind(rawValue: rawKind) }
     }
 
     public override func encode(with coder: NSCoder) {
         super.encode(with: coder)
-        coder.encode(kind?.rawValue, forKey: "kind")
+        coder.encode(kind?.rawValue, forKey: "action")
     }
 
     // MARK: Proto Conversion
diff --git a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+LinkPreview.swift b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+LinkPreview.swift
index 5c7839032..ba3dd26a1 100644
--- a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+LinkPreview.swift	
+++ b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+LinkPreview.swift	
@@ -14,12 +14,12 @@ public extension VisibleMessage {
 
         public required init?(coder: NSCoder) {
             if let title = coder.decodeObject(forKey: "title") as! String? { self.title = title }
-            if let url = coder.decodeObject(forKey: "url") as! String? { self.url = url }
+            if let url = coder.decodeObject(forKey: "urlString") as! String? { self.url = url }
         }
 
         public func encode(with coder: NSCoder) {
             coder.encode(title, forKey: "title")
-            coder.encode(url, forKey: "url")
+            coder.encode(url, forKey: "urlString")
         }
 
         public static func fromProto(_ proto: SNProtoDataMessagePreview) -> LinkPreview? {
diff --git a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Quote.swift b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Quote.swift
index f25eb7d9c..00e6e1b2c 100644
--- a/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Quote.swift	
+++ b/SessionMessagingKit/Messages/Visible Message/VisibleMessage+Quote.swift	
@@ -16,14 +16,14 @@ public extension VisibleMessage {
 
         public required init?(coder: NSCoder) {
             if let timestamp = coder.decodeObject(forKey: "timestamp") as! UInt64? { self.timestamp = timestamp }
-            if let publicKey = coder.decodeObject(forKey: "publicKey") as! String? { self.publicKey = publicKey }
-            if let text = coder.decodeObject(forKey: "text") as! String? { self.text = text }
+            if let publicKey = coder.decodeObject(forKey: "authorId") as! String? { self.publicKey = publicKey }
+            if let text = coder.decodeObject(forKey: "body") as! String? { self.text = text }
         }
 
         public func encode(with coder: NSCoder) {
             coder.encode(timestamp, forKey: "timestamp")
-            coder.encode(publicKey, forKey: "publicKey")
-            coder.encode(text, forKey: "text")
+            coder.encode(publicKey, forKey: "authorId")
+            coder.encode(text, forKey: "body")
         }
 
         public static func fromProto(_ proto: SNProtoDataMessageQuote) -> Quote? {
diff --git a/SessionMessagingKit/Messages/Visible Message/VisibleMessage.swift b/SessionMessagingKit/Messages/Visible Message/VisibleMessage.swift
index c2277264f..c564cf397 100644
--- a/SessionMessagingKit/Messages/Visible Message/VisibleMessage.swift	
+++ b/SessionMessagingKit/Messages/Visible Message/VisibleMessage.swift	
@@ -22,14 +22,14 @@ public final class VisibleMessage : Message {
     // MARK: Coding
     public required init?(coder: NSCoder) {
         super.init(coder: coder)
-        if let text = coder.decodeObject(forKey: "text") as! String? { self.text = text }
-        if let attachmentIDs = coder.decodeObject(forKey: "attachmentIDs") as! [String]? { self.attachmentIDs = attachmentIDs }
+        if let text = coder.decodeObject(forKey: "body") as! String? { self.text = text }
+        if let attachmentIDs = coder.decodeObject(forKey: "attachments") as! [String]? { self.attachmentIDs = attachmentIDs }
     }
 
     public override func encode(with coder: NSCoder) {
         super.encode(with: coder)
-        coder.encode(text, forKey: "text")
-        coder.encode(attachmentIDs, forKey: "attachmentIDs")
+        coder.encode(text, forKey: "body")
+        coder.encode(attachmentIDs, forKey: "attachments")
     }
 
     // MARK: Proto Conversion
diff --git a/SessionUtilities/TSRequest.m b/SessionUtilities/TSRequest.m
index 3d3fc9257..4d0951939 100644
--- a/SessionUtilities/TSRequest.m
+++ b/SessionUtilities/TSRequest.m
@@ -46,6 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     _parameters = parameters ?: @{};
+
     [self setHTTPMethod:method];
 
     return self;