Some sniffer improvements.