Version-check related changes.