Bring everything into alignment with revised DB frameworks