LDAP-279: more minor tweaks