Envelope::payload methods fix