diff --git a/enzevalos_iphone/DataHandler.swift b/enzevalos_iphone/DataHandler.swift
index 469e732b57d4bb2785f1a4b08cf03ae38f01f225..1d8a01f2c6f0e596da8bc63b76e8a92c0c7d50be 100644
--- a/enzevalos_iphone/DataHandler.swift
+++ b/enzevalos_iphone/DataHandler.swift
@@ -226,7 +226,7 @@ class DataHandler {
             sk = NSEntityDescription.insertNewObject(forEntityName: "SecretKey", into: managedObjectContext) as! SecretKey
             sk.keyID = keyID
             sk.obsolete = false
-            sk.importedDate = Date () as NSDate
+            sk.importedDate = Date() //as NSDate
             UserManager.storeUserValue(keyID as AnyObject, attribute: Attribute.prefSecretKeyID)
             let adr = UserManager.loadUserValue(Attribute.userAddr) as! String
             let name = UserManager.loadUserValue(Attribute.accountname) as? String ?? adr
diff --git a/enzevalos_iphone/EphemeralMail.swift b/enzevalos_iphone/EphemeralMail.swift
index cf309ed698f5432bac6c6f87d4967d11feb22f14..a70af7a1726c14968bc4fb0717a29b2470cdc7ff 100644
--- a/enzevalos_iphone/EphemeralMail.swift
+++ b/enzevalos_iphone/EphemeralMail.swift
@@ -19,7 +19,7 @@ open class EphemeralMail: Mail {
     public var uid: UInt64
     public var predecessor: PersistentMail?
 
-    public init(to: NSSet = [], cc: NSSet = [], bcc: NSSet = [], date: Date = Date(), subject: String? = nil, body: String? = UserManager.loadUserSignature(), uid: UInt64 = 0, predecessor: PersistentMail? = nil) {
+    public init(to: NSSet = [], cc: NSSet = [], bcc: NSSet = [], date: Date = Date(), subject: String? = nil, body: String? = ""/*UserManager.loadUserSignature()*/, uid: UInt64 = 0, predecessor: PersistentMail? = nil) {
         self.cc = cc
         self.bcc = bcc
         self.to = to
diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index 4ac83abdc39949c9697693fa9f222cc98bc78209..52f9f0864f5699fd4bac4deb8fc0bd6d17a45d56 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -1004,7 +1004,7 @@ class MailHandler {
                     let end = content.range(of: "-----END PGP PRIVATE KEY BLOCK-----") {
                     let s = start.lowerBound
                     let e = end.upperBound
-                    let sk = content[s..<e]
+                    let sk = String(content[s..<e])
                     return sk
                 }
             }
diff --git a/enzevalos_iphone/Onboarding.swift b/enzevalos_iphone/Onboarding.swift
index 6713ec513c4bbef6e24272e97d0d128c745182cb..a8c994710980a1f65302602da7f311dca2ec0a18 100644
--- a/enzevalos_iphone/Onboarding.swift
+++ b/enzevalos_iphone/Onboarding.swift
@@ -44,9 +44,9 @@ class Onboarding: NSObject {
     static let font = UIFont.init(name: "Helvetica-Light", size: 28)
     static let padding: CGFloat = 30
 
-    static var doWhenDone: () -> () = { Void in }
-    static var fail: () -> () = { Void in }
-    static var work: () -> () = { Void in }
+    static var doWhenDone: () -> () = { () -> () in }
+    static var fail: () -> () = { () -> () in }
+    static var work: () -> () = { () -> () in }
 
     static var credentialFails = 0
 
@@ -279,7 +279,7 @@ class Onboarding: NSObject {
         Onboarding.password.returnKeyType = .done
         password.text = UserManager.loadUserValue(.userPW) as? String
         mailaddress.text = UserManager.loadUserValue(.userAddr) as? String
-        doWhenDone = { Void in }
+        doWhenDone = { () -> () in }
 
         let email = OnboardingContentViewController.content(withTitle: nil, body: NSLocalizedString("InsertMailAddressAndPassword", comment: ""), videoURL: nil, inputView: credentials, buttonText: nil, actionBlock: callback)
         username = UITextField.init()