diff --git a/Classes/Base.lproj/ChatRoomViewController.xib b/Classes/Base.lproj/ChatRoomViewController.xib
index 884acb066..d49eaf081 100644
--- a/Classes/Base.lproj/ChatRoomViewController.xib
+++ b/Classes/Base.lproj/ChatRoomViewController.xib
@@ -150,7 +150,6 @@
                                             <accessibility key="accessibilityConfiguration" hint="" label=""/>
                                             <fontDescription key="fontDescription" type="system" pointSize="26"/>
                                             <textInputTraits key="textInputTraits" autocapitalizationType="sentences" autocorrectionType="yes" spellCheckingType="yes" keyboardAppearance="alert" returnKeyType="send"/>
-                                            <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES" address="YES"/>
                                             <connections>
                                                 <outlet property="delegate" destination="-1" id="RVG-F4-M9q"/>
                                             </connections>
diff --git a/Classes/LinphoneUI/UILabel+Boldify.h b/Classes/LinphoneUI/UILabel+Boldify.h
index bac9c5995..53a06eb84 100644
--- a/Classes/LinphoneUI/UILabel+Boldify.h
+++ b/Classes/LinphoneUI/UILabel+Boldify.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @interface UILabel (Boldify)
 
diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h
index 5b3d50d5b..7934b6f3d 100644
--- a/Classes/LinphoneUI/UILinphone.h
+++ b/Classes/LinphoneUI/UILinphone.h
@@ -18,6 +18,7 @@
  */ 
 
 #import <UIKit/UIColor.h>
+#import <UIKit/UIKit.h>
 
 #define LINPHONE_MAIN_COLOR       [UIColor colorWithRed:207.0f/255.0f green:76.0f/255.0f blue:41.0f/255.0f alpha:1.0f]
 #define LINPHONE_SETTINGS_BG_IOS7 [UIColor colorWithRed:164/255. green:175/255. blue:183/255. alpha:1.0]//[UIColor colorWithWhite:0.88 alpha:1.0]
diff --git a/Classes/LinphoneUI/UITextField+DoneButton.h b/Classes/LinphoneUI/UITextField+DoneButton.h
index bc6fca2d3..d596019bc 100644
--- a/Classes/LinphoneUI/UITextField+DoneButton.h
+++ b/Classes/LinphoneUI/UITextField+DoneButton.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @interface UITextField (DoneButton)
 - (void)addDoneButton;
diff --git a/Classes/LinphoneUI/VideoZoomHandler.h b/Classes/LinphoneUI/VideoZoomHandler.h
index 2b4bb3a86..01f6a9cb3 100644
--- a/Classes/LinphoneUI/VideoZoomHandler.h
+++ b/Classes/LinphoneUI/VideoZoomHandler.h
@@ -18,6 +18,7 @@
  */ 
 
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @interface VideoZoomHandler : NSObject {
     float zoomLevel, cx, cy;
diff --git a/Classes/SideMenuViewController.m b/Classes/SideMenuViewController.m
index 0d867b303..7390242ca 100644
--- a/Classes/SideMenuViewController.m
+++ b/Classes/SideMenuViewController.m
@@ -20,8 +20,8 @@
 
 - (void)updateHeader {
 	LinphoneProxyConfig *default_proxy = linphone_core_get_default_proxy_config([LinphoneManager getLc]);
-	const LinphoneAddress *addr = linphone_proxy_config_get_identity_address(default_proxy);
 	if (default_proxy != NULL) {
+		const LinphoneAddress *addr = linphone_proxy_config_get_identity_address(default_proxy);
 		[FastAddressBook setDisplayNameLabel:_nameLabel forAddress:addr];
 		char *as_string = linphone_address_as_string(addr);
 		_addressLabel.text = [NSString stringWithUTF8String:as_string];
@@ -35,7 +35,6 @@
 }
 
 - (IBAction)onLateralSwipe:(id)sender {
-	LOGI(@"Swipe!");
 	[[PhoneMainView instance].mainViewController hideSideMenu:YES];
 }
 @end