Merge pull request #130 from digawp/datastore
Miscellaneous fixes to datastore

(main@59e41cef3a6954dc17c469825cd94b119f0f7e84)