Some bugfixing for the change to LDAP-like units