Fix gross oversights in original ACL patch