more ldap fixes