Various ACL fixes