Made some more changes in checking ACL/Auth.