@@ -75,11 +75,11 @@
 	[_name release];
 	_name = [self.mainViewController.sites[indexPath.row] retain];
 	_length = [siteStorage lengthForSite: _name];
 	_legacy = [siteStorage isSiteLegacy: _name];
 
-	self.nameField.text = [_name NSObject];
+	self.nameField.text = _name.NSObject;
 	self.lengthField.text = [NSString stringWithFormat: @"%zu", _length];
 	self.legacySwitch.on = _legacy;
 
 	[self.mainViewController.tableView deselectRowAtIndexPath: indexPath
 							 animated: YES];
@@ -180,11 +180,11 @@
 		generator = [NewPasswordGenerator generator];
 
 	generator.site = _name;
 	generator.length = _length;
 
-	passphrase = of_strdup([self.passphraseField.text UTF8String]);
+	passphrase = of_strdup(self.passphraseField.text.UTF8String);
 	generator.passphrase = passphrase;
 
 	mainStoryboard = [UIStoryboard storyboardWithName: @"Main"
 						   bundle: nil];
 	activityController = [mainStoryboard