fixed a couple of places where the default DB could be used inappropriately