Improvements to `certificate-check' validator