more DB init improvements