diff --git a/MasterPassword/ObjC/MPAppDelegate_Store.m b/MasterPassword/ObjC/MPAppDelegate_Store.m
index 5e49d0ec..444c9814 100644
--- a/MasterPassword/ObjC/MPAppDelegate_Store.m
+++ b/MasterPassword/ObjC/MPAppDelegate_Store.m
@@ -336,9 +336,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
 
 - (void)ubiquityStoreManager:(UbiquityStoreManager *)manager willLoadStoreIsCloud:(BOOL)isCloudStore {
 
-//    [manager setValue:@"C61DCF27-BD25-4CF1-AE8F-8B613DF8AB47" forKey:@"storeUUID"];
     NSManagedObjectContext *moc = [self mainManagedObjectContextIfReady];
-    NSLog( @"willLoadStoreIsCloud:%d mainMoc:%@", isCloudStore, moc);
     [moc performBlockAndWait:^{
         [moc saveToStore];
 
@@ -352,7 +350,6 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
 - (void)ubiquityStoreManager:(UbiquityStoreManager *)manager didLoadStoreForCoordinator:(NSPersistentStoreCoordinator *)coordinator
                      isCloud:(BOOL)isCloudStore {
 
-    NSLog( @"didLoadStoreForCoordinatorStores:%d isCloud:%d", [[coordinator persistentStores] count], isCloudStore );
     inf(@"Using iCloud? %@", @(isCloudStore));
     MPCheckpoint( MPCheckpointCloud, @{
             @"enabled" : @(isCloudStore)
@@ -385,7 +382,6 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
 
     self.privateManagedObjectContext = privateManagedObjectContext;
     self.mainManagedObjectContext = mainManagedObjectContext;
-    NSLog( @"set mainMoc:%@", mainManagedObjectContext );
 }
 
 - (void)ubiquityStoreManager:(UbiquityStoreManager *)manager didEncounterError:(NSError *)error cause:(UbiquityStoreErrorCause)cause
diff --git a/MasterPassword/ObjC/iOS/MPLogsViewController.m b/MasterPassword/ObjC/iOS/MPLogsViewController.m
index bce3229d..33ea31da 100644
--- a/MasterPassword/ObjC/iOS/MPLogsViewController.m
+++ b/MasterPassword/ObjC/iOS/MPLogsViewController.m
@@ -32,9 +32,11 @@
     [super viewDidLoad];
 
     [[NSNotificationCenter defaultCenter] addObserverForName:NSUserDefaultsDidChangeNotification object:nil
-                                                       queue:[NSOperationQueue mainQueue] usingBlock:
+                                                       queue:nil usingBlock:
             ^(NSNotification *note) {
-                self.levelControl.selectedSegmentIndex = [[MPiOSConfig get].traceMode boolValue]? 1: 0;
+                dispatch_async( dispatch_get_main_queue(), ^{
+                    self.levelControl.selectedSegmentIndex = [[MPiOSConfig get].traceMode boolValue]? 1: 0;
+                });
             }];
 }
 
diff --git a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m
index a4b2b204..f67cf0c4 100644
--- a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m
+++ b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m
@@ -632,7 +632,7 @@
 
 #ifdef CRASHLYTICS
                         [[Crashlytics sharedInstance] setBoolValue:[[MPConfig get].rememberLogin boolValue] forKey:@"rememberLogin"];
-                        [[Crashlytics sharedInstance] setBoolValue:[self storeManager].cloudEnabled forKey:@"iCloud"];
+                        [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].iCloudEnabled boolValue] forKey:@"iCloudEnabled"];
                         [[Crashlytics sharedInstance] setBoolValue:[[MPConfig get].iCloudDecided boolValue] forKey:@"iCloudDecided"];
                         [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].sendInfo boolValue] forKey:@"sendInfo"];
                         [[Crashlytics sharedInstance] setBoolValue:[[MPiOSConfig get].helpHidden boolValue] forKey:@"helpHidden"];
@@ -648,8 +648,8 @@
 #ifdef TESTFLIGHT_SDK_VERSION
                         [TestFlight addCustomEnvironmentInformation:PearlStringNSB( [MPConfig get].rememberLogin )
                                                              forKey:@"rememberLogin"];
-                        [TestFlight addCustomEnvironmentInformation:PearlStringB( [self storeManager].cloudEnabled )
-                                                             forKey:@"iCloud"];
+                        [TestFlight addCustomEnvironmentInformation:PearlStringNSB( [MPiOSConfig get].iCloudEnabled )
+                                                             forKey:@"iCloudEnabled"];
                         [TestFlight addCustomEnvironmentInformation:PearlStringNSB( [MPConfig get].iCloudDecided )
                                                              forKey:@"iCloudDecided"];
                         [TestFlight addCustomEnvironmentInformation:PearlStringNSB( [MPiOSConfig get].sendInfo )
@@ -671,7 +671,7 @@
 #endif
         MPCheckpoint( MPCheckpointConfig, @{
                 @"rememberLogin"       : @([[MPConfig get].rememberLogin boolValue]),
-                @"iCloud"              : @([self storeManager].cloudEnabled),
+                @"iCloudEnabled"       : @([[MPiOSConfig get].iCloudEnabled boolValue]),
                 @"iCloudDecided"       : @([[MPConfig get].iCloudDecided boolValue]),
                 @"sendInfo"            : @([[MPiOSConfig get].sendInfo boolValue]),
                 @"helpHidden"          : @([[MPiOSConfig get].helpHidden boolValue]),