diff --git a/datastore/fsds.nim b/datastore/fsds.nim
index ee18c56..e3a6464 100644
--- a/datastore/fsds.nim
+++ b/datastore/fsds.nim
@@ -210,7 +210,7 @@ proc query*[K,V](
   let env = FsQueryEnv[K,V](self: self, basePath: DataBuffer.new(basePath))
   success FsQueryHandle[K, V](query: query, env: env)
 
-proc close*[K,V](handle: var DbQueryHandle[K,V,FsQueryEnv[K,V]]) =
+proc close*[K,V](handle: var FsQueryHandle[K,V]) =
   if not handle.closed:
     handle.closed = true
 
diff --git a/datastore/sql/sqliteds.nim b/datastore/sql/sqliteds.nim
index e642b07..79d4a31 100644
--- a/datastore/sql/sqliteds.nim
+++ b/datastore/sql/sqliteds.nim
@@ -167,7 +167,7 @@ proc close*[K,V](handle: var SqQueryHandle[K,V]) =
     discard sqlite3_clear_bindings(handle.env)
     handle.env.dispose()
 
-iterator queyIter*[K, V](
+iterator queryIter*[K, V](
     handle: var SqQueryHandle[K, V]
 ): ?!DbQueryResponse[K, V] =
   while not handle.cancel:
diff --git a/datastore/threads/threadproxyds.nim b/datastore/threads/threadproxyds.nim
index 1f4d679..8d85c84 100644
--- a/datastore/threads/threadproxyds.nim
+++ b/datastore/threads/threadproxyds.nim
@@ -152,7 +152,7 @@ method has*[BT](self: ThreadDatastore[BT],
     self.tp.spawn hasTask(ctx, ds, key)
   return ctx[].res.toRes(v => v)
 
-method deleteTask[T, DB](ctx: TaskCtx[T], ds: DB;
+proc deleteTask[T, DB](ctx: TaskCtx[T], ds: DB;
                        key: KeyId) {.gcsafe.} =
   ## run backend command
   executeTask(ctx):
@@ -217,7 +217,7 @@ method put*[DB](
   return success()
 
 
-method getTask[DB](ctx: TaskCtx[DataBuffer], ds: DB;
+proc getTask[DB](ctx: TaskCtx[DataBuffer], ds: DB;
                  key: KeyId) {.gcsafe, nimcall.} =
   ## run backend command
   executeTask(ctx):
@@ -246,11 +246,11 @@ method close*[BT](self: ThreadDatastore[BT]): Future[?!void] {.async.} =
 type
   QResult = DbQueryResponse[KeyId, DataBuffer]
 
-method queryTask[DB](
+proc queryTask[DB](
     ctx: TaskCtx[QResult],
     ds: DB,
     query: DbQuery[KeyId],
-) {.gcsafe, nimcall.} =
+) =
   ## run query command
   mixin queryIter
   executeTask(ctx):
@@ -272,7 +272,7 @@ method queryTask[DB](
       var handle = handleRes.get()
       static:
         echo "HANDLE: ", typeof(handle)
-      for item in handle.queyIter():
+      for item in handle.queryIter():
         # wait for next request from async thread
 
         if ctx[].cancelled: