Further tidies and minor fixes to the tables that control which ACL