Small updates to database creation and initial population