misc change for upgrade