Improve a few checks.