diff --git a/datastore.nim b/datastore.nim
index 6d43a20..8242f6d 100644
--- a/datastore.nim
+++ b/datastore.nim
@@ -4,4 +4,4 @@ import ./datastore/sql
 import ./datastore/mountedds
 import ./datastore/tieredds
 
-export datastore, fsds, mountedds, tieredds, sql
+export datastore, fsds, mountedds, tieredds
diff --git a/datastore/sql/sqliteds.nim b/datastore/sql/sqliteds.nim
index 423c4a1..8ccc97a 100644
--- a/datastore/sql/sqliteds.nim
+++ b/datastore/sql/sqliteds.nim
@@ -214,7 +214,7 @@ proc contains*(self: SQLiteDatastore, key: DbKey): bool =
 
 proc new*(T: type SQLiteDatastore,
           path: string,
-          readOnly = false): ?!T =
+          readOnly = false): ?!SQLiteDatastore =
 
   let
     flags =
diff --git a/datastore/sql/sqlitedsdb.nim b/datastore/sql/sqlitedsdb.nim
index ea06e50..902be64 100644
--- a/datastore/sql/sqlitedsdb.nim
+++ b/datastore/sql/sqlitedsdb.nim
@@ -29,7 +29,7 @@ type
 
   SQLiteDsDb* = object
     readOnly*: bool
-    dbPath*: string
+    dbPath*: DataBuffer
     containsStmt*: ContainsStmt
     deleteStmt*: DeleteStmt
     env*: SQLite
@@ -311,7 +311,7 @@ proc open*(
 
   success SQLiteDsDb(
     readOnly: readOnly,
-    dbPath: path,
+    dbPath: DataBuffer.new path,
     containsStmt: containsStmt,
     deleteStmt: deleteStmt,
     env: env.release,
diff --git a/datastore/sql/sqliteutils.nim b/datastore/sql/sqliteutils.nim
index a235eb6..9884083 100644
--- a/datastore/sql/sqliteutils.nim
+++ b/datastore/sql/sqliteutils.nim
@@ -22,7 +22,7 @@ type
   AutoDisposed*[T: ptr|ref] = object
     val*: T
 
-  DataProc* = proc(s: RawStmtPtr) {.closure, gcsafe.}
+  DataProc* = proc(s: RawStmtPtr) {.gcsafe.}
 
   NoParams* = tuple # empty tuple
 
diff --git a/tests/datastore/dscommontests.nim b/tests/datastore/dscommontests.nim
index 24dd7d3..beda975 100644
--- a/tests/datastore/dscommontests.nim
+++ b/tests/datastore/dscommontests.nim
@@ -5,7 +5,7 @@ import pkg/chronos
 import pkg/stew/results
 import pkg/questionable/results
 
-import pkg/datastore
+import pkg/datastore/datastore
 
 proc basicStoreTests*(
   ds: Datastore,