More DB fixes.