Fixed database-upgrade issues, merged configs