@@ -30,14 +30,14 @@
     @IBOutlet var legacySwitch: UISwitch?
     @IBOutlet var keyFileField: UITextField?
     @IBOutlet var passphraseField: UITextField?
     public var mainViewController: MainViewController?
 
-    private var name: OFString = "".ofObject
-    private var length: size_t = 0
+    private var name: String = ""
+    private var length: UInt = 0
     private var isLegacy: Bool = false
-    private var keyFile: OFString? = nil
+    private var keyFile: String? = nil
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
         guard let mainViewController = self.mainViewController else { return }
@@ -48,14 +48,14 @@
         name = mainViewController.sites[indexPath.row]
         length = siteStorage.length(forSite: name)
         isLegacy = siteStorage.isLegacy(site: name)
         keyFile = siteStorage.keyFile(forSite: name)
 
-        nameField?.text = name.nsObject
+        nameField?.text = name
         lengthField?.text = "\(length)"
         legacySwitch?.isOn = isLegacy
-        keyFileField?.text = keyFile?.nsObject
+        keyFileField?.text = keyFile
 
         tableView.deselectRow(at: indexPath, animated: true)
     }
 
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
@@ -132,22 +132,23 @@
     }
 
     private func generateWithCallback(_ block: (_: NSMutableString) -> ()) {
         let generator: PasswordGenerator = isLegacy ?
             LegacyPasswordGenerator() : NewPasswordGenerator()
-        generator.site = name
-        generator.length = length
+        generator.site = name.ofObject
+        generator.length = size_t(length)
 
         if let keyFile = keyFile {
             guard let documentDirectory = NSSearchPathForDirectoriesInDomains(
                 .documentDirectory, .userDomainMask, true).first
             else {
                 print("Could not get key files: No documents directory")
                 return
             }
 
-            let keyFilePath = documentDirectory.ofObject.appending(keyFile)
+            let keyFilePath =
+                documentDirectory.ofObject.appending(keyFile.ofObject)
             generator.keyFile = OFMutableData(contentsOfFile: keyFilePath)
         }
 
         let passphraseText = (passphraseField?.text ?? "") as NSString
         let passphrase = of_strdup(passphraseText.utf8String!)!