Unbreak SNMP-based clients

With these two commits I was able to register new SNMP clients which used to fail before.