Among other changes, prodding at DatabaseAccess