diff --git a/SignalServiceKit/src/Loki/LokiMessagingAPI.swift b/SignalServiceKit/src/Loki/LokiMessagingAPI.swift
index 1e7f2a9c8..91498a201 100644
--- a/SignalServiceKit/src/Loki/LokiMessagingAPI.swift
+++ b/SignalServiceKit/src/Loki/LokiMessagingAPI.swift
@@ -43,12 +43,12 @@ import PromiseKit
     }
     
     public static func sendMessage(_ lokiMessage: LokiMessage) -> Promise<RawResponse> {
-        let target = Target(address: "http://13.238.53.205", port: 8080)
+        let target = Target(address: "http://13.238.53.205", port: 8080) // TODO: Temporary
         return invoke(.sendMessage, on: target, with: lokiMessage.toJSON())
     }
     
     public static func retrieveAllMessages() -> Promise<RawResponse> {
-        let target = Target(address: "http://13.238.53.205", port: 8080)
+        let target = Target(address: "http://13.238.53.205", port: 8080) // TODO: Temporary
         let parameters = [
             "pubKey" : OWSIdentityManager.shared().identityKeyPair()!.hexEncodedPublicKey,
             "lastHash" : "" // TODO: Implement
diff --git a/SignalServiceKit/src/Loki/Mnemonic/Mnemonic.swift b/SignalServiceKit/src/Loki/Mnemonic/Mnemonic.swift
index da67083a3..e6083ad4e 100644
--- a/SignalServiceKit/src/Loki/Mnemonic/Mnemonic.swift
+++ b/SignalServiceKit/src/Loki/Mnemonic/Mnemonic.swift
@@ -5,7 +5,7 @@ public enum Mnemonic {
     
     public struct Language : Hashable {
         fileprivate let filename: String
-        fileprivate let prefixLength: Int
+        fileprivate let prefixLength: UInt
         
         public static let english = Language(filename: "english", prefixLength: 3)
         public static let japanese = Language(filename: "japanese", prefixLength: 3)
@@ -15,7 +15,7 @@ public enum Mnemonic {
         private static var wordSetCache: [Language:[String]] = [:]
         private static var truncatedWordSetCache: [Language:[String]] = [:]
         
-        private init(filename: String, prefixLength: Int) {
+        private init(filename: String, prefixLength: UInt) {
             self.filename = filename
             self.prefixLength = prefixLength
         }
@@ -128,7 +128,7 @@ public enum Mnemonic {
         return String(p1 + p2 + p3 + p4)
     }
     
-    private static func determineChecksumIndex(for x: [String], prefixLength: Int) -> Int {
+    private static func determineChecksumIndex(for x: [String], prefixLength: UInt) -> Int {
         let checksum = Array(x.map { $0.prefix(length: prefixLength) }.joined().utf8).crc32()
         return Int(checksum) % x.count
     }
@@ -136,7 +136,7 @@ public enum Mnemonic {
 
 private extension String {
     
-    func prefix(length: Int) -> String {
-        return String(self[startIndex..<index(startIndex, offsetBy: length)])
+    func prefix(length: UInt) -> String {
+        return String(self[startIndex..<index(startIndex, offsetBy: Int(length))])
     }
 }
diff --git a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m
index ad4c6e617..76c042e23 100644
--- a/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m
+++ b/SignalServiceKit/src/Network/WebSockets/OWSWebSocket.m
@@ -910,7 +910,7 @@ NSString *const kNSNotification_OWSWebSocketStateDidChange = @"kNSNotification_O
 {
     OWSAssertIsOnMainThread();
     
-    // Loki: Since we don't use websockets, disable them.
+    // Loki: Since we don't use web sockets, disable them.
     return NO;
 
     // Don't open socket in app extensions.