More LDAP tweaks