Fixes as per the sniffer.