Fix ACL, users, entries table