More #3 fixes pre-check.