Reorder initializers to match repacked struct
Reorder initialization to match repacked struct