Two dist-check related changes: