Core/Packets: Corrections to the structures as per @Shauren's request