diff --git a/AboutPage/UpdateControlData.cs b/AboutPage/UpdateControlData.cs
index 90a78ab96..0af2c6633 100644
--- a/AboutPage/UpdateControlData.cs
+++ b/AboutPage/UpdateControlData.cs
@@ -127,7 +127,9 @@ namespace MatterHackers.MatterControl
 					haveShowUpdateRequired = true;
 					if (!UserSettings.Instance.IsTouchScreen)
 					{
+#if !__ANDROID__
 						UiThread.RunOnIdle(CheckForUpdateWindow.Show);
+#endif
 					}
 				}
 			}
@@ -436,7 +438,7 @@ namespace MatterHackers.MatterControl
 			{
 				//Change download file to friendly file name
 				System.IO.File.Move(updateFileName, friendlyFileName);
-#if __ANDROID__ 
+#if __ANDROID__
 				if (InstallUpdateFromMainActivity != null)
 				{
 					InstallUpdateFromMainActivity(this, null);
diff --git a/ApplicationView/AdvancedControlsPanel.cs b/ApplicationView/AdvancedControlsPanel.cs
index 79b34f46d..987dfe20b 100644
--- a/ApplicationView/AdvancedControlsPanel.cs
+++ b/ApplicationView/AdvancedControlsPanel.cs
@@ -144,8 +144,10 @@ namespace MatterHackers.MatterControl
 
 			if (!UserSettings.Instance.IsTouchScreen)
 			{
+#if !__ANDROID__
 				MenuOptionSettings.sliceSettingsPopOut = sliceSettingPopOut;
 				MenuOptionSettings.controlsPopOut = controlsPopOut;
+#endif
 			}
 
 			var optionsControls = new PrinterConfigurationScrollWidget();
diff --git a/ApplicationView/MainApplicationWidget.cs b/ApplicationView/MainApplicationWidget.cs
index 916d552c7..3a89fcb20 100644
--- a/ApplicationView/MainApplicationWidget.cs
+++ b/ApplicationView/MainApplicationWidget.cs
@@ -111,9 +111,11 @@ namespace MatterHackers.MatterControl
 
 			if (!UserSettings.Instance.IsTouchScreen)
 			{
+#if !__ANDROID__
 				// The application menu bar, which is suppressed on Android
 				ApplicationMenuRow menuRow = new ApplicationMenuRow();
 				TopContainer.AddChild(menuRow);
+#endif
 			}
 
 			menuSeparator = new GuiWidget();
@@ -157,9 +159,11 @@ namespace MatterHackers.MatterControl
 
 			if (!UserSettings.Instance.IsTouchScreen)
 			{
+#if !__ANDROID__
 				// The application menu bar, which is suppressed on Android
 				var menuRow = new ApplicationMenuRow();
 				container.AddChild(menuRow);
+#endif
 			}
 
 			var menuSeparator = new GuiWidget()
diff --git a/DataStorage/Datastore.cs b/DataStorage/Datastore.cs
index 702884982..3afb1512e 100644
--- a/DataStorage/Datastore.cs
+++ b/DataStorage/Datastore.cs
@@ -182,20 +182,8 @@ namespace MatterHackers.MatterControl.DataStorage
 		/// <summary>
 		/// Returns the public storage folder (ex. download folder on Android)
 		/// </summary>
-		/// <returns></returns>
-		public string PublicDataStoragePath
-		{
-			get
-			{
-				return Android.OS.Environment.GetExternalStoragePublicDirectory(Android.OS.Environment.DirectoryDownloads).ToString();
-			}
-		}
+		public string PublicDataStoragePath { get; } = Android.OS.Environment.GetExternalStoragePublicDirectory(Android.OS.Environment.DirectoryDownloads).AbsolutePath;
 #endif
-
-		public override string ToString()
-		{
-			return base.ToString();
-		}
 	}
 
 	public class Datastore