Improvements to checks.