Fixed some ACL bugs