Fixes for the SNMP engine