Packet and analyzer fixes