diff --git a/Classes/KIF b/Classes/KIF
index 1fe66431b..621d453e3 160000
--- a/Classes/KIF
+++ b/Classes/KIF
@@ -1 +1 @@
-Subproject commit 1fe66431b824990a58f1ae063bf0e2151079e90e
+Subproject commit 621d453e3ae9255894f319c9814d50ae7d676121
diff --git a/TestsUI/LinphoneTestCase.m b/TestsUI/LinphoneTestCase.m
index 7186dbb0f..2812779c9 100644
--- a/TestsUI/LinphoneTestCase.m
+++ b/TestsUI/LinphoneTestCase.m
@@ -21,7 +21,7 @@
 
 	NSString *language = [[NSLocale preferredLanguages] objectAtIndex:0];
 	if (!([language isEqualToString:@"en"] || [language containsString:@"en-"])) {
-		LOGF(@"Language must be en (English) instead of %@", language);
+		LOGF(@"Language must be 'en' (English) instead of %@", language);
 	}
 	linphone_core_set_log_level(ORTP_WARNING);
 }
@@ -29,8 +29,9 @@
 - (void)beforeAll {
 	[super beforeAll];
 #if TARGET_IPHONE_SIMULATOR
-	[tester acknowledgeSystemAlert]; // Contact access alert
-	[tester acknowledgeSystemAlert]; // Local notification / badge alert
+	while ([tester acknowledgeSystemAlert]) {
+		[tester waitForTimeInterval:.5f];
+	};
 #endif
 	// go to dialer
 	for (NSString *button in @[ @"Cancel", @"Back", @"Dialer" ]) {
diff --git a/prepare.py b/prepare.py
index 0b9fac314..7a7089c38 100755
--- a/prepare.py
+++ b/prepare.py
@@ -471,7 +471,6 @@ def main(argv=None):
                            'x86_64', 'devices'], help="The platform to build for (default is 'x86_64 devices'). Space separated architectures in list: {0}.".format(', '.join([repr(platform) for platform in platforms])))
 
     args, additional_args = argparser.parse_known_args()
-    additional_args += ["-G", args.G__generator]
 
     if args.debug_verbose:
         additional_args += ["-DENABLE_DEBUG_LOGS=YES"]
@@ -485,6 +484,14 @@ def main(argv=None):
 
     install_git_hook()
 
+    additional_args += ["-G", args.G__generator]
+    if args.G__generator == 'Ninja':
+        if check_installed("ninja", "it") != 0:
+            return 1
+        generator = 'ninja -C'
+    else:
+        generator = '$(MAKE) -C'
+
     selected_platforms = []
     for platform in args.platform:
         if platform == 'all':
@@ -497,13 +504,6 @@ def main(argv=None):
             selected_platforms += [platform]
     selected_platforms = list(set(selected_platforms))
 
-    if args.G__generator == 'Ninja':
-        if check_installed("ninja", "it") != 0:
-            return 1
-        generator = 'ninja -C'
-    else:
-        generator = '$(MAKE) -C'
-
     for platform in selected_platforms:
         target = targets[platform]