wpapcap2john fixes from Jim