diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index b5d636ac..767a7b26 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="49" android:versionName="0.9.5b" package="keepass2android.keepass2android" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
+			android:versionCode="49" 
+			android:versionName="0.9.5b" 
+			package="keepass2android.keepass2android" 
+			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
 	<permission android:description="@string/permission_desc" android:icon="@drawable/ic_launcher" android:label="KP2A internal file browsing" android:name="keepass2android.keepass2android.permission.KP2aInternalFileBrowsing" android:protectionLevel="signature" />
 	<application android:label="keepass2android" android:icon="@drawable/ic_launcher">
diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml
index 7f373591..cf05dcb2 100644
--- a/src/keepass2android/Properties/AndroidManifest_nonet.xml
+++ b/src/keepass2android/Properties/AndroidManifest_nonet.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="47" 
-			android:versionName="0.9.4" 
+			android:versionCode="49" 
+			android:versionName="0.9.5b" 
 			package="keepass2android.keepass2android_nonet"
 			android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
 	<application android:label="keepass2android" android:icon="@drawable/ic_launcher_offline">
 		<provider android:name="group.pals.android.lib.ui.filechooser.providers.localfile.LocalFileProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.localfile" android:exported="false" />
 		<provider android:name="group.pals.android.lib.ui.filechooser.providers.history.HistoryProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.history" android:exported="false" />
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 8405167e..637fcc65 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -497,9 +497,9 @@
 		* Fixed issues with file browsing (especially on Android 4.4)\n
 		* Fixed issue with loading .kdb files (Keepass 1) on Nexus 5 with Android Lollipop\n
 		* Added option to prevent taking screenshots/displaying app in recent apps list\n
-		* Fixed issue with Google Drive file storage\n
-		* Allow key files on deliberate storage types\n
-		* Updated Dropbox SDK to include an official security patch\n
+		* Fixed issue with Google Drive file storage (regular edition)\n
+		* Allow key files on deliberate storage types (regular edition)\n
+		* Updated Dropbox SDK to include an official security patch (regular edition)\n
 		* Updated build tools --> apk size increased :-(\n
 		I have promised some more changes. They will come with the next release - sorry. I wanted to publish these hot fixes as soon as possible.
 	</string>
diff --git a/src/keepass2android/Utils/Util.cs b/src/keepass2android/Utils/Util.cs
index 49d3f27f..81e9521b 100644
--- a/src/keepass2android/Utils/Util.cs
+++ b/src/keepass2android/Utils/Util.cs
@@ -225,7 +225,7 @@ namespace keepass2android
 
 		public static void ShowSftpDialog(Activity activity, FileSelectedHandler onStartBrowse, Action onCancel)
 		{
-#if !EXCLUDE_JAVAFILESTORAGE
+#if !EXCLUDE_JAVAFILESTORAGE && !NoNet
 			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 			View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.sftpcredentials, null);
 			builder.SetView(dlgContents);
diff --git a/src/keepass2android/fileselect/FileStorageSetupActivity.cs b/src/keepass2android/fileselect/FileStorageSetupActivity.cs
index aa058035..a8b30f8d 100644
--- a/src/keepass2android/fileselect/FileStorageSetupActivity.cs
+++ b/src/keepass2android/fileselect/FileStorageSetupActivity.cs
@@ -19,7 +19,9 @@ namespace keepass2android.fileselect
 	           ConfigChanges.KeyboardHidden)]
 	public class FileStorageSetupActivity : Activity, IFileStorageSetupActivity
 #if !EXCLUDE_JAVAFILESTORAGE
+#if !NoNet
 		,Keepass2android.Javafilestorage.IJavaFileStorageFileStorageSetupActivity
+#endif
 #endif
 	{
 		private bool _isRecreated = false;
diff --git a/src/keepass2android/fileselect/FileStorageSetupInitiatorActivity.cs b/src/keepass2android/fileselect/FileStorageSetupInitiatorActivity.cs
index 166387b6..4544fb5d 100644
--- a/src/keepass2android/fileselect/FileStorageSetupInitiatorActivity.cs
+++ b/src/keepass2android/fileselect/FileStorageSetupInitiatorActivity.cs
@@ -10,7 +10,9 @@ namespace keepass2android
 	public class FileStorageSetupInitiatorActivity: 
 #if !EXCLUDE_JAVAFILESTORAGE
 		Java.Lang.Object
+#if !NoNet
 		,Keepass2android.Javafilestorage.IJavaFileStorageFileStorageSetupInitiatorActivity
+#endif
 		,
 #endif
  IFileStorageSetupInitiatorActivity