Fixes in ACL