Fix injector bug, implement first pass of ACL-based restrictions