More improvements to access checks.