FIx acl errors and other improvments
Add forgotten files