MessagePack fixes