More fixes of ldap