Fixes multiple issues with initial ACL options