Fix up some vestigal crap from acl stuff