More MessagePack structure correction.