Fixes for ACL