Couple of changes to the PacketHandler