diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go
index f9caed27f5..7ce24478df 100644
--- a/swarm/api/api_test.go
+++ b/swarm/api/api_test.go
@@ -36,7 +36,7 @@ func testApi(t *testing.T, f func(*Api)) {
 	}
 	os.RemoveAll(datadir)
 	defer os.RemoveAll(datadir)
-	dpa, err := storage.NewLocalDPA(datadir)
+	dpa, err := storage.NewLocalDPA(datadir, "")
 	if err != nil {
 		return
 	}
diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go
index 93f1d4c2fd..510ddd1247 100644
--- a/swarm/fuse/swarmfs_test.go
+++ b/swarm/fuse/swarmfs_test.go
@@ -810,7 +810,7 @@ func TestFUSE(t *testing.T) {
 	}
 	os.RemoveAll(datadir)
 
-	dpa, err := storage.NewLocalDPA(datadir)
+	dpa, err := storage.NewLocalDPA(datadir, "")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/swarm/storage/dbstore.go b/swarm/storage/dbstore.go
index 46a5c16ccc..4dec144755 100644
--- a/swarm/storage/dbstore.go
+++ b/swarm/storage/dbstore.go
@@ -95,10 +95,19 @@ func NewDbStore(path string, hash SwarmHasher, capacity uint64, radius int) (s *
 
 	data, _ := s.db.Get(keyEntryCnt)
 	s.entryCnt = BytesToU64(data)
+	if len(data) > 0 {
+		s.entryCnt++
+	}
 	data, _ = s.db.Get(keyAccessCnt)
 	s.accessCnt = BytesToU64(data)
+	if len(data) > 0 {
+		s.accessCnt++
+	}
 	data, _ = s.db.Get(keyDataIdx)
 	s.dataIdx = BytesToU64(data)
+	if len(data) > 0 {
+		s.dataIdx++
+	}
 	s.gcPos, _ = s.db.Get(keyGCPos)
 	if s.gcPos == nil {
 		s.gcPos = s.gcStartPos
diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go
index 44a2669f12..23fda3abf0 100644
--- a/swarm/storage/dpa.go
+++ b/swarm/storage/dpa.go
@@ -63,9 +63,12 @@ type DPA struct {
 }
 
 // for testing locally
-func NewLocalDPA(datadir string) (*DPA, error) {
+func NewLocalDPA(datadir string, hashalgorithm string) (*DPA, error) {
 
-	hash := MakeHashFunc("SHA256")
+	if hashalgorithm == "" {
+		hashalgorithm = "SHA3"
+	}
+	hash := MakeHashFunc(hashalgorithm)
 
 	dbStore, err := NewDbStore(datadir, hash, singletonSwarmDbCapacity, 0)
 	if err != nil {
@@ -116,6 +119,7 @@ func (self *DPA) Start() {
 
 func (self *DPA) Stop() {
 	self.lock.Lock()
+	self.Close()
 	defer self.lock.Unlock()
 	if !self.running {
 		return
diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go
index b442e6cc54..bf9eeb2e77 100644
--- a/swarm/storage/localstore.go
+++ b/swarm/storage/localstore.go
@@ -74,4 +74,6 @@ func (self *LocalStore) Get(key Key) (chunk *Chunk, err error) {
 }
 
 // Close local store
-func (self *LocalStore) Close() {}
+func (self *LocalStore) Close() {
+	self.DbStore.Close()
+}
diff --git a/swarm/swarm.go b/swarm/swarm.go
index 9db15325ae..ab447d9240 100644
--- a/swarm/swarm.go
+++ b/swarm/swarm.go
@@ -320,7 +320,7 @@ func NewLocalSwarm(datadir, port string) (self *Swarm, err error) {
 	}
 	config.Port = port
 
-	dpa, err := storage.NewLocalDPA(datadir)
+	dpa, err := storage.NewLocalDPA(datadir, "")
 	if err != nil {
 		return
 	}