diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 52ae6a99..e55d544f 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -731,11 +731,10 @@ public class CordovaWebView extends WebView {
         }
 
         // Init preferences
-        if ("false".equals(this.getProperty("useBrowserHistory", "false"))) {
-            this.useBrowserHistory = false;
-        }
-        else {
-            this.useBrowserHistory = true;
+        this.useBrowserHistory = !"false".equals(this.getProperty("useBrowserHistory", "true"));
+        if (!this.useBrowserHistory) {
+            // Deprecated in Cordova 2.2.0.
+            Log.w(TAG, "useBrowserHistory=false is deprecated. Use history.back() instead of navigator.app.backHistory().");
         }
 
         if ("true".equals(this.getProperty("fullscreen", "false"))) {
diff --git a/framework/src/org/apache/cordova/Storage.java b/framework/src/org/apache/cordova/Storage.java
index c76c9e4e..5ec30688 100755
--- a/framework/src/org/apache/cordova/Storage.java
+++ b/framework/src/org/apache/cordova/Storage.java
@@ -137,7 +137,20 @@ public class Storage extends CordovaPlugin {
             this.path = this.cordova.getActivity().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
         }
 
-        this.dbName = this.path + File.pathSeparator + db + ".db";
+        this.dbName = this.path + File.separator + db + ".db";
+
+        /*
+         * What is all this nonsense? Well the separator was incorrect so the db was showing up in the wrong 
+         * directory. This bit of code fixes that issue and moves the db to the correct directory.
+         */
+        File oldDbFile = new File(this.path + File.pathSeparator + db + ".db");
+        if (oldDbFile.exists()) {
+            File dbPath = new File(this.path);
+            File dbFile = new File(dbName);
+            dbPath.mkdirs();
+            oldDbFile.renameTo(dbFile);
+        }
+        
         this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null);
     }