Fix and relax checks.