WIP: db creation requires fixes