diff --git a/.gitignore b/.gitignore
index b1d71466c11c1b3e442b90532cfe8cce9d7a8d5f..c4bda29d9ff422df69ac6e9be20ec46d8de051d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ Linphone.sdf
 Linphone.opensdf
 Agents/RegistrationHelper.cs
 Linphone/Linphone.csproj.user
+Linphone/AppPackages
+Linphone/Tasks/obj
 *.vcxproj.filters
 *.sdf
 **/packages/*
diff --git a/Linphone/Assets/linphonerc-factory b/Linphone/Assets/linphonerc-factory
index 53c1621269a32d905b64da3249c3f7c60c94d4f5..40ca1380b00ef3e3360bf1e7bdbf25f7e9f729b0 100644
--- a/Linphone/Assets/linphonerc-factory
+++ b/Linphone/Assets/linphonerc-factory
@@ -23,4 +23,4 @@ dtmf_player_amp=0.1
 
 [misc]
 history_max_size=30
-max_calls=1
+max_calls=2
diff --git a/Linphone/Model/SettingsManager.cs b/Linphone/Model/SettingsManager.cs
index 39c525dc559d390f8ac1d8b8c795155af9636507..580fa947ee24566c15709ef5093593504cd1fdde 100644
--- a/Linphone/Model/SettingsManager.cs
+++ b/Linphone/Model/SettingsManager.cs
@@ -297,7 +297,8 @@ namespace Linphone.Model {
                     dict[TransportKeyName] = EnumToTransport[proxyAddress.Transport];
                     dict[UsernameKeyName] = address.Username;
                     dict[DomainKeyName] = address.Domain;
-                    dict[OutboundProxyKeyName] = cfg.Routes.GetEnumerator().Current.ToString();
+                    if(cfg.Routes.GetEnumerator().Current != null)
+                        dict[OutboundProxyKeyName] = cfg.Routes.GetEnumerator().Current.ToString();
                     dict[ExpireKeyName] = String.Format("{0}", cfg.Expires);
                     AuthInfo authInfo = LinphoneManager.Instance.Core.FindAuthInfo(address.Domain, address.Username, address.Domain);
                     if (authInfo != null) {
diff --git a/Linphone/Package.appxmanifest b/Linphone/Package.appxmanifest
index b22e762d23835178f9a6ed2f2d308ed9f6d08523..981642c3633725a7d44c36396f5f28483eef0d24 100644
--- a/Linphone/Package.appxmanifest
+++ b/Linphone/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="BelledonneCommunications.Linphone" Publisher="CN=2D80E0B6-DE43-45FF-97F7-D17E115F1D12" Version="1.3.0.0" />
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
+  <Identity Name="BelledonneCommunications.Linphone" Publisher="CN=Julien Wadel" Version="1.3.0.0" />
   <mp:PhoneIdentity PhoneProductId="ed47fa26-a45b-4bda-82e1-cdc792d1d9bd" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Linphone</DisplayName>
@@ -30,6 +30,7 @@
     </Application>
   </Applications>
   <Capabilities>
+    <rescap:Capability Name="broadFileSystemAccess" />
     <Capability Name="internetClient" />
     <Capability Name="codeGeneration" />
     <uap:Capability Name="contacts" />
diff --git a/Linphone/Views/Dialer.xaml.cs b/Linphone/Views/Dialer.xaml.cs
index a49bfd148b9b40784949107aa63ccbe982cc5770..0d870b483c3ea406507e9aea913a7e2f207651b3 100644
--- a/Linphone/Views/Dialer.xaml.cs
+++ b/Linphone/Views/Dialer.xaml.cs
@@ -147,9 +147,11 @@ namespace Linphone.Views {
 
             if (LinphoneManager.Instance.Core.CallsNb > 0) {
                 Call call = LinphoneManager.Instance.Core.CurrentCall;
-                List<String> parameters = new List<String>();
-                parameters.Add(call.RemoteAddress.AsStringUriOnly());
-                Frame.Navigate(typeof(Views.InCall), parameters);
+                if( call != null){
+                    List<String> parameters = new List<String>();
+                    parameters.Add(call.RemoteAddress.AsStringUriOnly());
+                    Frame.Navigate(typeof(Views.InCall), parameters);
+                }
             }
 
             if (LinphoneManager.Instance.GetUnreadMessageCount() > 0) {