ldap config, fix-up generators, etc.