Discovery db fixup (complete)