diff --git a/db/db_impl.cc b/db/db_impl.cc
index 4f0ef367a..ec99a4a72 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -294,7 +294,7 @@ DBOptions SanitizeOptions(const std::string& dbname, const DBOptions& src) {
     result.wal_dir = dbname;
   }
   if (result.wal_dir.back() == '/') {
-    result.wal_dir = result.wal_dir.substr(result.wal_dir.size() - 1);
+    result.wal_dir = result.wal_dir.substr(0, result.wal_dir.size() - 1);
   }
 
   return result;
diff --git a/utilities/geodb/geodb_test.cc b/utilities/geodb/geodb_test.cc
index 49e72d9d0..1a42e3247 100644
--- a/utilities/geodb/geodb_test.cc
+++ b/utilities/geodb/geodb_test.cc
@@ -35,7 +35,7 @@ class GeoDBTest {
   }
 };
 
-const std::string GeoDBTest::kDefaultDbName = "/tmp/geodefault/";
+const std::string GeoDBTest::kDefaultDbName = "/tmp/geodefault";
 Options GeoDBTest::options = Options();
 
 // Insert, Get and Remove