Polish up changes for ACL IDs