Tweaked two checks.