Some more fixes, and workarounds for the LDAP connector.