Make sure payloads get included where appropriate