More database setup tweaking