diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
index 26acf5497..47109d84d 100644
--- a/Riot/AppDelegate.m
+++ b/Riot/AppDelegate.m
@@ -1983,6 +1983,8 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
                 _incomingCallNotification = [UIAlertController alertControllerWithTitle:callPrompt
                                                                                 message:nil
                                                                          preferredStyle:UIAlertControllerStyleAlert];
+
+                __weak typeof(self) weakSelf = self;
                 
                 [_incomingCallNotification addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"decline", @"Vector", nil)
                                                                               style:UIAlertActionStyleDefault
diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m
index 38f44f36f..3858e6c01 100644
--- a/Riot/ViewController/SettingsViewController.m
+++ b/Riot/ViewController/SettingsViewController.m
@@ -25,6 +25,8 @@
 
 #import "AppDelegate.h"
 #import "AvatarGenerator.h"
+
+#import "MXKEncryptionKeysExportView.h"
 #import "BugReportViewController.h"
 
 #import "WebViewViewController.h"