PacketHandling
Some fixes