some fixes for LDAP (more to come)