Fix up access checks
More access check cleanups
Another access check
oops :P