Correct some errors in payload and attachments