Fixed an issue with VerifyPacket and more cleanup