Discovery db fixup (preliminary)