More db init tweaks.