Some fixes for wireshark=1.2.7-1