Fixed files, improved acl service