Many sniffer fixes in many files