fixes for new separate database resets