Minor fixes for legacy builds vs. PCAP.