Initial ACL Support and Bug fixes