Fix payloads