From Robert Bullen: Fix for: Two minor bugs in Wiretap library: