Make ACL behaviour more consistent.
Couple of bugfixes.