DB initialization fixup