ACL fixes and other bugfixes