diff --git a/src/App/Pages/Settings/SettingsPage.cs b/src/App/Pages/Settings/SettingsPage.cs
index 1134c17f5..5be0079fe 100644
--- a/src/App/Pages/Settings/SettingsPage.cs
+++ b/src/App/Pages/Settings/SettingsPage.cs
@@ -92,7 +92,7 @@ namespace Bit.App.Pages
             if((await _fingerprint.GetAvailabilityAsync()) == FingerprintAvailability.Available)
             {
                 var fingerprintName = Helpers.OnPlatform(iOS: AppResources.TouchID, Android: AppResources.Fingerprint,
-                    WinPhone: AppResources.Fingerprint);
+                    Windows: AppResources.Fingerprint, WinPhone: AppResources.Fingerprint);
                 FingerprintCell = new ExtendedSwitchCell
                 {
                     Text = string.Format(AppResources.UnlockWith, fingerprintName),
diff --git a/src/App/Pages/Tools/ToolsPage.cs b/src/App/Pages/Tools/ToolsPage.cs
index 4af5d8495..f73046593 100644
--- a/src/App/Pages/Tools/ToolsPage.cs
+++ b/src/App/Pages/Tools/ToolsPage.cs
@@ -49,7 +49,7 @@ namespace Bit.App.Pages
                     AppResources.BitwardenAppExtensionDescription, "upload.png");
                 section.Add(ExtensionCell);
             }
-            else
+            if(Device.RuntimePlatform == Device.Android)
             {
                 var desc = _deviceInfoService.AutofillServiceSupported ?
                     AppResources.BitwardenAutofillServiceDescription :
diff --git a/src/App/Services/AuthService.cs b/src/App/Services/AuthService.cs
index ab271946f..3a6d3afff 100644
--- a/src/App/Services/AuthService.cs
+++ b/src/App/Services/AuthService.cs
@@ -211,7 +211,6 @@ namespace Bit.App.Services
         {
             CipherService.CachedCiphers = null;
             _tokenService.Token = null;
-            _tokenService.RefreshToken = null;
             UserId = null;
             Email = null;
             _cryptoService.ClearKeys();
diff --git a/src/UWP/App.xaml.cs b/src/UWP/App.xaml.cs
index c782b714e..6364de0cb 100644
--- a/src/UWP/App.xaml.cs
+++ b/src/UWP/App.xaml.cs
@@ -117,13 +117,15 @@ namespace Bit.UWP
             container.RegisterSingleton<ISettingsApiRepository, SettingsApiRepository>();
             container.RegisterSingleton<ITwoFactorApiRepository, TwoFactorApiRepository>();
             container.RegisterSingleton<ISyncApiRepository, SyncApiRepository>();
+            container.RegisterSingleton<ICollectionRepository, CollectionRepository>();
+            container.RegisterSingleton<ICipherCollectionRepository, CipherCollectionRepository>();
 
             // Other
             container.RegisterSingleton(CrossConnectivity.Current);
             container.RegisterSingleton(UserDialogs.Instance);
             container.RegisterSingleton(CrossFingerprint.Current);
 
-            container.RegisterSingleton<ISettings>(Plugin.Settings.CrossSettings.Current);
+            container.RegisterSingleton(Plugin.Settings.CrossSettings.Current);
 
             // Push
             var pushListener = new PushNotificationListener();