diff --git a/Classes/ContactDetailsViewController.m b/Classes/ContactDetailsViewController.m
index e100d3fe6..35f010ae3 100644
--- a/Classes/ContactDetailsViewController.m
+++ b/Classes/ContactDetailsViewController.m
@@ -225,7 +225,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
     } else {
         [editButton setHidden:TRUE];
     }
-    }   
+}
 
 #pragma mark - UICompositeViewDelegate Functions
 
diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index b6b487a44..ae4adeb89 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -477,7 +477,6 @@
                                               otherButtonTitles:nil];
         [error show];
         [error release];
-        
     }
 }
 
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index e0d639045..994127187 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -585,10 +585,9 @@ static void linphone_iphone_log(struct _LinphoneCore * lc, const char * message)
 
 - (void)displayStatus:(NSString*) message {
 	// Post event
-	NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys:
-						   message, @"message",
-						   nil];
-	[[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneDisplayStatusUpdate object:self userInfo:dict];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneDisplayStatusUpdate
+                                                        object:self
+                                                      userInfo:@{@"message":message}];
 }
 
 
@@ -788,10 +787,9 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
 		[self setupGSMInteraction];
 	}
 	// Post event
-	NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys:
-						   [NSValue valueWithPointer:call], @"call",
-						   [NSNumber numberWithInt:state], @"state",
-						   [NSString stringWithUTF8String:message], @"message", nil];
+    NSDictionary* dict = @{@"call":   [NSValue valueWithPointer:call],
+                           @"state":  [NSNumber numberWithInt:state],
+                           @"message":[NSString stringWithUTF8String:message]};
 	[[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneCallUpdate object:self userInfo:dict];
 }
 
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index bf240e618..b4c070454 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -325,6 +325,7 @@ static RootViewManager* rootViewManagerInstance = nil;
     
 	switch (state) {					
 		case LinphoneCallIncomingReceived: 
+        case LinphoneCallIncomingEarlyMedia:
         {
 			[self displayIncomingCall:call];
 			break;
diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m
index 47e5a5b05..c876a277b 100644
--- a/Classes/Utils/FastAddressBook.m
+++ b/Classes/Utils/FastAddressBook.m
@@ -210,7 +210,8 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf
                         [addressBookMap setObject:lPerson forKey:lNormalizedKey];
                         CFRelease(lValue);
                         if (lLabel) CFRelease(lLabel);
-                        if (lLocalizedLabel) CFRelease(lLocalizedLabel);                    }
+                        if (lLocalizedLabel) CFRelease(lLocalizedLabel);
+                    }
                     CFRelease(lMap);
                 }
             }