diff --git a/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword.xcscheme b/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword.xcscheme
index 5ea0bfdb..1e7fa13b 100644
--- a/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword.xcscheme
+++ b/MasterPassword-Mac.xcodeproj/xcshareddata/xcschemes/MasterPassword.xcscheme
@@ -59,7 +59,7 @@
       <CommandLineArguments>
          <CommandLineArgument
             argument = "-com.apple.coredata.ubiquity.logLevel 3"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
       <AdditionalOptions>
diff --git a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme
index c185406a..5f32e1c0 100644
--- a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme	
+++ b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme	
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
+   LastUpgradeVersion = "0430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -39,8 +40,8 @@
       </MacroExpansion>
    </TestAction>
    <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
@@ -59,7 +60,7 @@
       <CommandLineArguments>
          <CommandLineArgument
             argument = "-com.apple.coredata.ubiquity.logLevel 3"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
       <AdditionalOptions>
diff --git a/MasterPassword/MasterPassword.entitlements b/MasterPassword/MasterPassword.entitlements
index 776574ec..b04a9cea 100644
--- a/MasterPassword/MasterPassword.entitlements
+++ b/MasterPassword/MasterPassword.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.developer.ubiquity-container-identifiers</key>
 	<array>
-		<string>$(TeamIdentifierPrefix)com.lyndir.lhunath.MasterPassword.1</string>
+		<string>$(TeamIdentifierPrefix)com.lyndir.lhunath.MasterPassword</string>
 	</array>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m
index a1ecb0ae..8a70a97d 100644
--- a/MasterPassword/iOS/MPMainViewController.m
+++ b/MasterPassword/iOS/MPMainViewController.m
@@ -413,7 +413,7 @@
                          case 4:
 #endif
                          {
-                             [[MPAppDelegate get] signOut];
+                             [[MPAppDelegate get] signOut:self];
                              [[MPAppDelegate get] loadKey:YES];
                              break;
                          }
diff --git a/MasterPassword/iOS/MasterPassword.entitlements b/MasterPassword/iOS/MasterPassword.entitlements
index 294e5383..53a819c9 100644
--- a/MasterPassword/iOS/MasterPassword.entitlements
+++ b/MasterPassword/iOS/MasterPassword.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.developer.ubiquity-container-identifiers</key>
 	<array>
-		<string>$(TeamIdentifierPrefix)com.lyndir.lhunath.MasterPassword.1</string>
+		<string>$(TeamIdentifierPrefix)com.lyndir.lhunath.MasterPassword</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>