fix for edit and some ACL stuff